From f6f4abc33ef797aadba4fc8902a737470ab24fdc Mon Sep 17 00:00:00 2001 From: chensi10 Date: Mon, 30 Aug 2021 18:25:39 +0800 Subject: [PATCH] Modify codex Signed-off-by: chensi10 --- src/appspawn_server.cpp | 10 ++- test/BUILD.gn | 2 +- test/mock/include/mock_server_socket.h | 74 ++++++++++++++----- test/mock/src/appspawn_msg_peer.cpp | 19 +++-- test/moduletest/BUILD.gn | 2 +- test/moduletest/appspawn_mst_test.cpp | 36 +++++---- .../app_spawn_socket_test.cpp | 46 +++++++----- .../server_socket_test/server_socket_test.cpp | 2 +- 8 files changed, 123 insertions(+), 68 deletions(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 0316f417..8dd64868 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -37,6 +37,8 @@ namespace { constexpr int32_t ERR_PIPE_FAIL = -100; constexpr int32_t MAX_LEN_SHORT_NAME = 16; constexpr int32_t WAIT_DELAY_US = 100 * 1000; // 100ms +constexpr int32_t GID_MEDIA = 1023; +constexpr int32_t MAX_GIDS = 64; constexpr std::string_view BUNDLE_NAME_CAMERA("com.ohos.camera"); constexpr std::string_view BUNDLE_NAME_PHOTOS("com.ohos.photos"); @@ -205,8 +207,12 @@ bool AppSpawnServer::ServerMain(char *longProcName, int64_t longProcNameLen) // special handle bundle name "com.ohos.photos" and "com.ohos.camera" if ((strcmp(appProperty->processName, BUNDLE_NAME_CAMERA.data()) == 0) || (strcmp(appProperty->processName, BUNDLE_NAME_PHOTOS.data()) == 0)) { - appProperty->gidTable[appProperty->gidCount] = 1023; - appProperty->gidCount++; + if (appProperty->gidCount < MAX_GIDS) { + appProperty->gidTable[appProperty->gidCount] = GID_MEDIA; + appProperty->gidCount++; + } else { + HiLog::Info(LABEL, "gidCount out of bounds !"); + } } return SetAppProcProperty(connectFd, appProperty, longProcName, longProcNameLen, fd); diff --git a/test/BUILD.gn b/test/BUILD.gn index ff4aa34f..9ee47cd3 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# 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 diff --git a/test/mock/include/mock_server_socket.h b/test/mock/include/mock_server_socket.h index 7b467486..5e167841 100644 --- a/test/mock/include/mock_server_socket.h +++ b/test/mock/include/mock_server_socket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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 @@ -22,8 +22,8 @@ namespace OHOS { namespace AppSpawn { - -static constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "MockServerSocket"}; +using namespace OHOS::HiviewDFX; +static constexpr HiLogLabel LABEL = {LOG_CORE, 0, "MockServerSocket"}; class MockServerSocket : public ServerSocket { public: @@ -41,7 +41,7 @@ public: MOCK_METHOD3(ReadSocketMessage, int32_t(int32_t socketFd, void *buf, int32_t len)); MOCK_METHOD3(WriteSocketMessage, int32_t(int32_t socketFd, const void *buf, int32_t len)); - int32_t ReadImplGidCountMax([[maybe_unused]]int32_t socketFd, void *buf, [[maybe_unused]]int32_t len) + int32_t ReadImplGidCountMax([[maybe_unused]] int32_t socketFd, void *buf, [[maybe_unused]] int32_t len) { std::lock_guard lock(mutex_); @@ -52,17 +52,26 @@ public: } params->uid = 0; params->gid = 0; - (void)memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + auto ret = memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + if (ret != EOK) { + HiLog::Info(LABEL, "memset_s failed"); + } params->gidCount = ClientSocket::MAX_GIDS + 1; std::string processName = "processName"; - (void)memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + ret = memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } std::string soPath = "soPath"; - (void)memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + ret = memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } return sizeof(ClientSocket::AppProperty); } - int32_t ReadImplProcessName([[maybe_unused]]int32_t socketFd, void *buf, [[maybe_unused]]int32_t len) + int32_t ReadImplProcessName([[maybe_unused]] int32_t socketFd, void *buf, [[maybe_unused]] int32_t len) { std::lock_guard lock(mutex_); @@ -73,17 +82,26 @@ public: } params->uid = 0; params->gid = 0; - (void)memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + auto ret = memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + if (ret != EOK) { + HiLog::Info(LABEL, "memset_s failed"); + } params->gidCount = ClientSocket::MAX_GIDS; std::string processName = ""; - (void)memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + ret = memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } std::string soPath = "soPath"; - (void)memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + ret = memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } return sizeof(ClientSocket::AppProperty); } - int32_t ReadImplValid([[maybe_unused]]int32_t socketFd, void *buf, [[maybe_unused]]int32_t len) + int32_t ReadImplValid([[maybe_unused]] int32_t socketFd, void *buf, [[maybe_unused]] int32_t len) { std::lock_guard lock(mutex_); @@ -94,17 +112,26 @@ public: } params->uid = 0; params->gid = 0; - (void)memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + auto ret = memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + if (ret != EOK) { + HiLog::Info(LABEL, "memset_s failed"); + } params->gidCount = ClientSocket::MAX_GIDS; std::string processName = "processName"; - (void)memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + ret = memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } std::string soPath = "soPath"; - (void)memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + ret = memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } return sizeof(ClientSocket::AppProperty); } - int32_t ReadImplValidLongProcessName([[maybe_unused]]int32_t socketFd, void *buf, [[maybe_unused]]int32_t len) + int32_t ReadImplValidLongProcessName([[maybe_unused]] int32_t socketFd, void *buf, [[maybe_unused]] int32_t len) { std::lock_guard lock(mutex_); @@ -115,12 +142,21 @@ public: } params->uid = 0; params->gid = 0; - (void)memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + auto ret = memset_s(params->gidTable, sizeof(params->gidTable), 0, sizeof(params->gidTable)); + if (ret != EOK) { + HiLog::Info(LABEL, "memset_s failed"); + } params->gidCount = ClientSocket::MAX_GIDS; std::string processName = "ProcessName1234567890"; - (void)memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + ret = memcpy_s(params->processName, sizeof(params->processName), processName.c_str(), processName.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } std::string soPath = "soPath"; - (void)memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + ret = memcpy_s(params->soPath, sizeof(params->soPath), soPath.c_str(), soPath.length()); + if (ret != EOK) { + HiLog::Info(LABEL, "memcpy_s failed"); + } return sizeof(ClientSocket::AppProperty); } diff --git a/test/mock/src/appspawn_msg_peer.cpp b/test/mock/src/appspawn_msg_peer.cpp index 875f445f..55dd8c13 100644 --- a/test/mock/src/appspawn_msg_peer.cpp +++ b/test/mock/src/appspawn_msg_peer.cpp @@ -43,16 +43,25 @@ ClientSocket::AppProperty *AppSpawnMsgPeer::GetMsg() const { HiLog::Info(LABEL, "GetMsg"); if (buf_ != nullptr) { - ClientSocket::AppProperty* appProperty = reinterpret_cast(buf_.get()); + ClientSocket::AppProperty *appProperty = reinterpret_cast(buf_.get()); appProperty->uid = 0; appProperty->gid = 0; - (void)memset_s(appProperty->gidTable, sizeof(appProperty->gidTable), 0, sizeof(appProperty->gidTable)); + auto ret = memset_s(appProperty->gidTable, sizeof(appProperty->gidTable), 0, sizeof(appProperty->gidTable)); + if (ret != EOK) { + HiLog::Error(LABEL, "memset_s failed!"); + } appProperty->gidCount = ClientSocket::MAX_GIDS; std::string processName = "processName"; - (void)memcpy_s(appProperty->processName, sizeof(appProperty->processName), - processName.c_str(), processName.length()); + ret = memcpy_s( + appProperty->processName, sizeof(appProperty->processName), processName.c_str(), processName.length()); + if (ret != EOK) { + HiLog::Error(LABEL, "memcpy_s failed!"); + } std::string soPath = "soPath"; - (void)memcpy_s(appProperty->soPath, sizeof(appProperty->soPath), soPath.c_str(), soPath.length()); + ret = memcpy_s(appProperty->soPath, sizeof(appProperty->soPath), soPath.c_str(), soPath.length()); + if (ret != EOK) { + HiLog::Error(LABEL, "memcpy_s failed!"); + } } return reinterpret_cast(buf_.get()); diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index aecb36e4..f2356871 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# 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 diff --git a/test/moduletest/appspawn_mst_test.cpp b/test/moduletest/appspawn_mst_test.cpp index 8e3ed674..78a665e7 100644 --- a/test/moduletest/appspawn_mst_test.cpp +++ b/test/moduletest/appspawn_mst_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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 @@ -34,11 +34,11 @@ namespace { const bool CHECK_OK = true; const bool CHECK_ERROR = false; const int32_t DEFAULT_PID = 0; -const int32_t FILE_PATH_SIZE = 50; +const int32_t FILE_PATH_SIZE = 50; const int32_t CMD_SIZE = 50; const int32_t BUFFER_SIZE = 512; const int32_t BASE_TYPE = 10; -const int32_t CONNECT_RETRY_DELAY = 50 * 1000; +const int32_t CONNECT_RETRY_DELAY = 50 * 1000; const int32_t CONNECT_RETRY_MAX_TIMES = 5; const int32_t UID_POSITION_MOVE = 5; const int32_t GID_POSITION_MOVE = 5; @@ -107,7 +107,7 @@ bool checkUid(const int32_t &pid, const AppSpawnStartMsg ¶ms) HiLog::Error(LABEL, "get Uid info failed."); return CHECK_ERROR; } - if (strlen(uidPtr) > UID_POSITION_MOVE){ + if (strlen(uidPtr) > UID_POSITION_MOVE) { uidPtr = uidPtr + UID_POSITION_MOVE; } int32_t uid = (int32_t)strtol(uidPtr, NULL, BASE_TYPE); @@ -128,7 +128,7 @@ bool checkGid(const int32_t &pid, const AppSpawnStartMsg ¶ms) HiLog::Error(LABEL, "get Gid info failed."); return CHECK_ERROR; } - if (strlen(gidPtr) > GID_POSITION_MOVE){ + if (strlen(gidPtr) > GID_POSITION_MOVE) { gidPtr = gidPtr + GID_POSITION_MOVE; } int32_t gid = (int32_t)strtol(gidPtr, NULL, BASE_TYPE); @@ -143,18 +143,18 @@ std::size_t getGids(const int32_t &pid, std::vector &gids) { if (readFileInfo(buffer, pid, "status")) { // Move to Groups position - char *groupsPtr = strstr(buffer, "Groups"); - if (groupsPtr == nullptr) { + char *groupsPtr = strstr(buffer, "Groups"); + if (groupsPtr == nullptr || strlen(groupsPtr) > BUFFER_SIZE) { HiLog::Error(LABEL, "get Groups info failed."); return CHECK_ERROR; } - if (strlen(groupsPtr) > GROUPS_POSITION_MOVE){ + if (strlen(groupsPtr) > GROUPS_POSITION_MOVE) { groupsPtr = groupsPtr + GROUPS_POSITION_MOVE; } // Get the row content of Groups char *saveptr = NULL; - char *line = strtok_r(groupsPtr , DELIMITER_NEWLINE, &saveptr); - if (line == nullptr) { + char *line = strtok_r(groupsPtr, DELIMITER_NEWLINE, &saveptr); + if (line == nullptr || strlen(line) > BUFFER_SIZE) { HiLog::Error(LABEL, "get Groups line info failed."); return CHECK_ERROR; } @@ -199,7 +199,7 @@ bool checkProcName(const int32_t &pid, const AppSpawnStartMsg ¶ms) { FILE *fp = nullptr; char cmd[CMD_SIZE]; - if (sprintf_s(cmd, sizeof(cmd),"ps -o ARGS=CMD -p %d |grep -v CMD", pid) <= 0) { + if (sprintf_s(cmd, sizeof(cmd), "ps -o ARGS=CMD -p %d |grep -v CMD", pid) <= 0) { HiLog::Error(LABEL, "cmd sprintf_s fail ."); return CHECK_ERROR; } @@ -219,12 +219,12 @@ bool checkProcName(const int32_t &pid, const AppSpawnStartMsg ¶ms) GTEST_LOG_(INFO) << "strcmp" << " :" << strcmp(params.procName.c_str(), procName) << "."; - if (params.procName.compare(0,params.procName.size(),procName,params.procName.size()) == 0) { + if (params.procName.compare(0, params.procName.size(), procName, params.procName.size()) == 0) { pclose(fp); return CHECK_OK; } HiLog::Error(LABEL, " procName=%{public}s, params.procName=%{public}s.", procName, params.procName.c_str()); - + } else { HiLog::Error(LABEL, "Getting procName failed."); } @@ -236,7 +236,7 @@ bool checkProcName(const int32_t &pid, const AppSpawnStartMsg ¶ms) bool checkProcessIsDestroyed(const int32_t &pid) { char filePath[FILE_PATH_SIZE]; - if (sprintf_s(filePath,sizeof(filePath), "/proc/%d", pid) <= 0) { + if (sprintf_s(filePath, sizeof(filePath), "/proc/%d", pid) <= 0) { HiLog::Error(LABEL, "filePath sprintf_s fail ."); return CHECK_ERROR; } @@ -261,8 +261,8 @@ bool checkAppspawnPID() if (fgets(pid, sizeof(pid), fp) != nullptr) { pclose(fp); return CHECK_OK; - } - + } + HiLog::Error(LABEL, "Getting Pid failed."); pclose(fp); @@ -327,9 +327,7 @@ void AppSpawnModuleTest::SetUp() } void AppSpawnModuleTest::TearDown() -{ - -} +{} /* * Feature: AppSpawn diff --git a/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp b/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp index dd4883da..4e175972 100644 --- a/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp +++ b/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp @@ -65,7 +65,7 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_001, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_001 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); EXPECT_EQ(-1, appSpawnSocket->GetSocketFd()); auto socketFd = appSpawnSocket->CreateSocket(); @@ -89,7 +89,7 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_002, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_002 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); int32_t socketFd = -2; appSpawnSocket->CloseSocket(socketFd); @@ -112,7 +112,7 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_003, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_003 start"; std::unique_ptr appSpawnSocket = std::make_unique(""); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); EXPECT_EQ(-1, appSpawnSocket->PackSocketAddr()); @@ -135,7 +135,7 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_004, TestSize.Level0) "InvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalid" "InvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalid"; std::unique_ptr appSpawnSocket = std::make_unique(invalidSocketName.c_str()); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); EXPECT_EQ(-1, appSpawnSocket->PackSocketAddr()); @@ -155,7 +155,7 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_005, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_005 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); EXPECT_EQ(0, appSpawnSocket->PackSocketAddr()); @@ -175,11 +175,11 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_006, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_006 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); int32_t socketFd = -1; std::unique_ptr buff = std::make_unique(10); - ASSERT_FALSE(buff == nullptr); + EXPECT_TRUE(buff); int32_t len = 10; EXPECT_EQ(-1, appSpawnSocket->ReadSocketMessage(socketFd, buff.get(), len)); @@ -200,12 +200,13 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_007, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_007 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); auto socketFd = appSpawnSocket->CreateSocket(); std::unique_ptr buff = nullptr; int32_t len = 10; EXPECT_EQ(-1, appSpawnSocket->ReadSocketMessage(socketFd, buff.get(), len)); + appSpawnSocket->CloseSocket(socketFd); GTEST_LOG_(INFO) << "App_Spawn_Socket_007 end"; } @@ -223,13 +224,14 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_008, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_008 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); auto socketFd = appSpawnSocket->CreateSocket(); std::unique_ptr buff = std::make_unique(10); - ASSERT_FALSE(buff == nullptr); + EXPECT_TRUE(buff); int32_t len = 0; EXPECT_EQ(-1, appSpawnSocket->ReadSocketMessage(socketFd, buff.get(), len)); + appSpawnSocket->CloseSocket(socketFd); GTEST_LOG_(INFO) << "App_Spawn_Socket_008 end"; } @@ -247,13 +249,14 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_009, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_009 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); auto socketFd = appSpawnSocket->CreateSocket(); std::unique_ptr buff = std::make_unique(10); - ASSERT_FALSE(buff == nullptr); + EXPECT_TRUE(buff); int32_t len = -1; EXPECT_EQ(-1, appSpawnSocket->ReadSocketMessage(socketFd, buff.get(), len)); + appSpawnSocket->CloseSocket(socketFd); GTEST_LOG_(INFO) << "App_Spawn_Socket_009 end"; } @@ -271,11 +274,11 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_010, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_010 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); std::string content = "hiworld"; int32_t len = content.length(); std::unique_ptr buff = std::make_unique(len); - ASSERT_FALSE(buff == nullptr); + EXPECT_TRUE(buff); int32_t fd[2] = {0, 0}; if (pipe(fd) == -1) { @@ -307,7 +310,7 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_011, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_011 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); int32_t socketFd = -1; std::string buff = "hiworld"; @@ -329,12 +332,13 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_012, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_012 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); auto socketFd = appSpawnSocket->CreateSocket(); std::unique_ptr buff = nullptr; int32_t len = 10; EXPECT_EQ(-1, appSpawnSocket->WriteSocketMessage(socketFd, buff.get(), len)); + appSpawnSocket->CloseSocket(socketFd); GTEST_LOG_(INFO) << "App_Spawn_Socket_012 end"; } @@ -352,12 +356,13 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_013, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_013 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); auto socketFd = appSpawnSocket->CreateSocket(); std::string buff = "hiworld"; int32_t len = 0; EXPECT_EQ(-1, appSpawnSocket->WriteSocketMessage(socketFd, buff.c_str(), len)); + appSpawnSocket->CloseSocket(socketFd); GTEST_LOG_(INFO) << "App_Spawn_Socket_013 end"; } @@ -375,12 +380,13 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_014, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_014 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); auto socketFd = appSpawnSocket->CreateSocket(); std::string buff = "hiworld"; int32_t len = -1; EXPECT_EQ(-1, appSpawnSocket->WriteSocketMessage(socketFd, buff.c_str(), len)); + appSpawnSocket->CloseSocket(socketFd); GTEST_LOG_(INFO) << "App_Spawn_Socket_014 end"; } @@ -398,11 +404,11 @@ HWTEST(AppSpawnSocketTest, App_Spawn_Socket_015, TestSize.Level0) GTEST_LOG_(INFO) << "App_Spawn_Socket_015 start"; std::unique_ptr appSpawnSocket = std::make_unique("AppSpawnSocketTest"); - ASSERT_FALSE(appSpawnSocket == nullptr); + EXPECT_TRUE(appSpawnSocket); std::string content = "hiworld"; int32_t len = content.length(); std::unique_ptr buff = std::make_unique(len); - ASSERT_FALSE(buff == nullptr); + EXPECT_TRUE(buff); int32_t fd[2] = {0, 0}; if (pipe(fd) == -1) { diff --git a/test/unittest/server_socket_test/server_socket_test.cpp b/test/unittest/server_socket_test/server_socket_test.cpp index 890a67bc..a194b106 100644 --- a/test/unittest/server_socket_test/server_socket_test.cpp +++ b/test/unittest/server_socket_test/server_socket_test.cpp @@ -173,7 +173,7 @@ HWTEST(ServerSocketTest, Server_Socket_005, TestSize.Level0) */ HWTEST(ServerSocketTest, Server_Socket_006, TestSize.Level0) { - GTEST_LOG_(INFO) << "Server_Socket_006 start"; + GTEST_LOG_(INFO) << "Server_Socket_006 start"; std::string invalidSocketName = "InvalidInvalidInvalidInvalidInvalidInvalidInvalidInvalid" -- Gitee