From fbd54a45c642e903472a73db138643fa8a5ec6be Mon Sep 17 00:00:00 2001 From: chensihan Date: Sat, 14 Sep 2024 16:57:03 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chensihan --- .../src/file_permission_test.cpp | 68 +++++ tests/unittests/backup_utils/BUILD.gn | 41 +++ .../b_jsonutil/b_jsonutil_other_test.cpp | 283 ++++++++++++++++++ 3 files changed, 392 insertions(+) create mode 100644 tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp diff --git a/test/unittest/file_permission_native/src/file_permission_test.cpp b/test/unittest/file_permission_native/src/file_permission_test.cpp index ac5fd8647..c669f22a6 100644 --- a/test/unittest/file_permission_native/src/file_permission_test.cpp +++ b/test/unittest/file_permission_native/src/file_permission_test.cpp @@ -711,6 +711,74 @@ HWTEST_F(FilePermissionTest, ParseErrorResults_test_002, testing::ext::TestSize. GTEST_LOG_(INFO) << "FileShareTest-end ParseErrorResults_test_002"; } +/** + * @tc.name: ErrorCodeConversion_test_001 + * @tc.desc: Test function of ErrorCodeConversion() interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: + */ +HWTEST_F(FilePermissionTest, ErrorCodeConversion_test_001, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin ErrorCodeConversion_test_001"; + auto ret = ErrorCodeConversion(SANDBOX_MANAGER_OK); + EXPECT_EQ(ret, 0); + + ret = ErrorCodeConversion(PERMISSION_DENIED); + EXPECT_EQ(ret, FileManagement::LibN::E_PERMISSION); + + int32_t UNKNOWN_ERROR = -114; + ret = ErrorCodeConversion(UNKNOWN_ERROR); + EXPECT_EQ(ret, FileManagement::LibN::E_UNKNOWN_ERROR); + GTEST_LOG_(INFO) << "FileShareTest-end ErrorCodeConversion_test_001"; +} + +/** + * @tc.name: ErrorCodeConversion_test_002 + * @tc.desc: Test function of ErrorCodeConversion() interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: + */ +HWTEST_F(FilePermissionTest, ErrorCodeConversion_test_002, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin ErrorCodeConversion_test_002"; + deque errorResults; + vector resultCodes; + auto ret = ErrorCodeConversion(SANDBOX_MANAGER_OK, errorResults, resultCodes); + EXPECT_EQ(ret, 0); + + ret = ErrorCodeConversion(INVALID_PARAMTER, errorResults, resultCodes); + EXPECT_EQ(ret, EPERM); + + resultCodes.emplace_back(static_cast(PolicyErrorCode::PERSISTENCE_FORBIDDEN)); + resultCodes.emplace_back(static_cast(PolicyErrorCode::INVALID_MODE)); + resultCodes.emplace_back(static_cast(PolicyErrorCode::INVALID_PATH)); + resultCodes.emplace_back(static_cast(PolicyErrorCode::PERMISSION_NOT_PERSISTED)); + + ret = ErrorCodeConversion(INVALID_PARAMTER, errorResults, resultCodes); + EXPECT_EQ(ret, FileManagement::LibN::E_PARAMS); + + errorResults.push_back(true); + ret = ErrorCodeConversion(INVALID_PARAMTER, errorResults, resultCodes); + EXPECT_EQ(ret, EPERM); + + errorResults.clear(); + ret = ErrorCodeConversion(SANDBOX_MANAGER_OK, errorResults, resultCodes); + EXPECT_EQ(ret, EPERM); + + resultCodes.clear(); + ret = ErrorCodeConversion(SANDBOX_MANAGER_OK, errorResults, resultCodes); + EXPECT_EQ(ret, 0); + + int32_t UNKNOWN_ERROR = -114; + ret = ErrorCodeConversion(UNKNOWN_ERROR, errorResults, resultCodes); + EXPECT_EQ(ret, FileManagement::LibN::E_UNKNOWN_ERROR); + GTEST_LOG_(INFO) << "FileShareTest-end ErrorCodeConversion_test_002"; +} + #endif } // namespace AppFileService } // namespace OHOS \ No newline at end of file diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index a6dc2788b..f6ab1f601 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -289,6 +289,46 @@ ohos_unittest("b_json_other_test") { use_exceptions = true } +ohos_unittest("b_jsonutil_other_test") { + module_out_path = path_module_out_tests + + sources = [ + "${path_backup}/tests/mock/cJson/src/cJsonMock.cpp", + "b_jsonutil/b_jsonutil_other_test.cpp", + ] + sources += backup_mock_parameter_src + + include_dirs = [ + "${path_backup}/utils", + "${path_base}/include", + "${path_backup}/tests/mock/cJson/include", + ] + include_dirs += backup_mock_parameter_include_dirs + + deps = [ + "${path_backup}/tests/utils:backup_test_utils", + "${path_backup}/utils/:backup_utils", + "${path_jsoncpp}:jsoncpp", + "${path_googletest}:gmock_main", + "${path_jsoncpp}:jsoncpp", + ] + + external_deps = [ + "cJSON:cjson", + "c_utils:utils", + "hilog:libhilog", + ] + + defines = [ + "LOG_TAG=\"app_file_service\"", + "LOG_DOMAIN=0xD004303", + "private = public", + "protected = public", + ] + + use_exceptions = true +} + ohos_unittest("b_json_clear_data_test") { module_out_path = path_module_out_tests @@ -340,6 +380,7 @@ group("backup_test") { ":b_json_other_test", ":b_json_test", ":b_jsonutil_test", + ":b_jsonutil_other_test", ":b_process_test", ":b_tarball_cmdline_test", ":b_tarball_factory_test", diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp new file mode 100644 index 000000000..bd2f9d1a4 --- /dev/null +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2022-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 + * + * 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. + */ + +#include +#include + +#include +#include + +#include +#include +#include + +#include "b_jsonutil/b_jsonutil.h" +#include "b_process/b_process.h" +#include "cJsonMock.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; +using namespace testing; + +class BJsonUtilTest : public testing::Test { +public: + // 所有测试用例执行之前执行 + static void SetUpTestCase(void); + // 所有测试用例执行之后执行 + static void TearDownTestCase(void); + // 每次测试用例执行之前执行 + void SetUp() {}; + // 每次测试用例执行之后执行 + void TearDown() {}; + + static inline shared_ptr cJsonMock = nullptr; +}; + +void BJsonUtilTest::SetUpTestCase() +{ + cJsonMock = make_shared(); + CJson::cJsonPtr = cJsonMock; +} + +void BJsonUtilTest::TearDownTestCase() +{ + CJson::cJsonPtr = nullptr; + cJsonMock = nullptr; +} + +/** + * @tc.number: b_jsonutil_BuildExtensionErrInfo_0101 + * @tc.name: b_jsonutil_BuildExtensionErrInfo_0101 + * @tc.desc: Test function of BuildExtensionErrInfo interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6F3GV + */ +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0101, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildExtensionErrInfo_0101"; + try { + std::string jsonStr; + int errCode = 1; + std::string errMsg = "error"; + int cjson = 0; + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(nullptr)); + bool result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errCode, errMsg); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errCode, errMsg); + EXPECT_FALSE(result); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonUtilTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "BJsonUtilTest-end BuildExtensionErrInfo_0101"; +} + +/** + * @tc.number: b_jsonutil_BuildExtensionErrInfo_0201 + * @tc.name: b_jsonutil_BuildExtensionErrInfo_0201 + * @tc.desc: Test function of BuildExtensionErrInfo interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6F3GV + */ +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildExtensionErrInfo_0201"; + try { + std::string jsonStr; + std::map> errFileInfo; + int cjson = 0; + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(nullptr)); + bool result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); + EXPECT_FALSE(result); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonUtilTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "BJsonUtilTest-end BuildExtensionErrInfo_0201"; +} + +/** + * @tc.number: b_jsonutil_BuildOnProcessRetInfo_0301 + * @tc.name: b_jsonutil_BuildOnProcessRetInfo_0301 + * @tc.desc: Test function of BuildOnProcessRetInfo interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6F3GV + */ +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0301, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildOnProcessRetInfo_0301"; + try { + std::string jsonStr; + std::string onProcessRet; + int cjson = 0; + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(nullptr)); + bool result = BJsonUtil::BuildOnProcessRetInfo(jsonStr, onProcessRet); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildOnProcessRetInfo(jsonStr, onProcessRet); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)) + .WillOnce(Return(nullptr)) + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); + result = BJsonUtil::BuildOnProcessRetInfo(jsonStr, onProcessRet); + EXPECT_FALSE(result); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonUtilTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "BJsonUtilTest-end BuildOnProcessRetInfo_0301"; +} + +/** + * @tc.number: b_jsonutil_BuildBundleInfoJson_0401 + * @tc.name: b_jsonutil_BuildBundleInfoJson_0401 + * @tc.desc: Test function of BuildBundleInfoJson interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6F3GV + */ +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfoJson_0401"; + try { + int32_t userId = 100; + std::string detailInfo; + int cjson = 0; + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(nullptr)); + bool result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); + EXPECT_FALSE(result); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonUtilTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "BJsonUtilTest-end BuildBundleInfoJson_0401"; +} + +/** + * @tc.number: b_jsonutil_BuildBundleInfoJson_0402 + * @tc.name: b_jsonutil_BuildBundleInfoJson_0402 + * @tc.desc: Test function of BuildBundleInfoJson interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6F3GV + */ +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfoJson_0402"; + try { + int32_t userId = 100; + std::string detailInfo; + int cjson = 0; + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)) + .WillOnce(Return(true)) + .WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + bool result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); + EXPECT_FALSE(result); + + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)) + .WillOnce(Return(true)) + .WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)) + .WillOnce(Return(true)) + .WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); + EXPECT_FALSE(result); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonUtilTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "BJsonUtilTest-end BuildBundleInfoJson_0402"; + } +} \ No newline at end of file -- Gitee From 7fbc82c4b40c83bbf80ce6041ffafdff63fee321 Mon Sep 17 00:00:00 2001 From: chensihan Date: Sat, 14 Sep 2024 17:02:52 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=20Si?= =?UTF-8?q?gned-off-by:=20chensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file_permission_native/src/file_permission_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/unittest/file_permission_native/src/file_permission_test.cpp b/test/unittest/file_permission_native/src/file_permission_test.cpp index c669f22a6..9ca354c2e 100644 --- a/test/unittest/file_permission_native/src/file_permission_test.cpp +++ b/test/unittest/file_permission_native/src/file_permission_test.cpp @@ -36,6 +36,8 @@ #include "permission_state_full.h" #include "token_setproc.h" +#include "file_permission.cpp" + using namespace testing; using namespace testing::ext; namespace OHOS { -- Gitee From 6e8880e8e7940d02330c3a7ecff112c2523fbb2d Mon Sep 17 00:00:00 2001 From: chensihan Date: Wed, 18 Sep 2024 09:26:05 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0ut=20Signed-off-by:=20c?= =?UTF-8?q?hensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/file_permission_test.cpp | 70 ------------------- tests/unittests/backup_utils/BUILD.gn | 1 - 2 files changed, 71 deletions(-) diff --git a/test/unittest/file_permission_native/src/file_permission_test.cpp b/test/unittest/file_permission_native/src/file_permission_test.cpp index 9ca354c2e..ac5fd8647 100644 --- a/test/unittest/file_permission_native/src/file_permission_test.cpp +++ b/test/unittest/file_permission_native/src/file_permission_test.cpp @@ -36,8 +36,6 @@ #include "permission_state_full.h" #include "token_setproc.h" -#include "file_permission.cpp" - using namespace testing; using namespace testing::ext; namespace OHOS { @@ -713,74 +711,6 @@ HWTEST_F(FilePermissionTest, ParseErrorResults_test_002, testing::ext::TestSize. GTEST_LOG_(INFO) << "FileShareTest-end ParseErrorResults_test_002"; } -/** - * @tc.name: ErrorCodeConversion_test_001 - * @tc.desc: Test function of ErrorCodeConversion() interface. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: - */ -HWTEST_F(FilePermissionTest, ErrorCodeConversion_test_001, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "FileShareTest-begin ErrorCodeConversion_test_001"; - auto ret = ErrorCodeConversion(SANDBOX_MANAGER_OK); - EXPECT_EQ(ret, 0); - - ret = ErrorCodeConversion(PERMISSION_DENIED); - EXPECT_EQ(ret, FileManagement::LibN::E_PERMISSION); - - int32_t UNKNOWN_ERROR = -114; - ret = ErrorCodeConversion(UNKNOWN_ERROR); - EXPECT_EQ(ret, FileManagement::LibN::E_UNKNOWN_ERROR); - GTEST_LOG_(INFO) << "FileShareTest-end ErrorCodeConversion_test_001"; -} - -/** - * @tc.name: ErrorCodeConversion_test_002 - * @tc.desc: Test function of ErrorCodeConversion() interface. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: - */ -HWTEST_F(FilePermissionTest, ErrorCodeConversion_test_002, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "FileShareTest-begin ErrorCodeConversion_test_002"; - deque errorResults; - vector resultCodes; - auto ret = ErrorCodeConversion(SANDBOX_MANAGER_OK, errorResults, resultCodes); - EXPECT_EQ(ret, 0); - - ret = ErrorCodeConversion(INVALID_PARAMTER, errorResults, resultCodes); - EXPECT_EQ(ret, EPERM); - - resultCodes.emplace_back(static_cast(PolicyErrorCode::PERSISTENCE_FORBIDDEN)); - resultCodes.emplace_back(static_cast(PolicyErrorCode::INVALID_MODE)); - resultCodes.emplace_back(static_cast(PolicyErrorCode::INVALID_PATH)); - resultCodes.emplace_back(static_cast(PolicyErrorCode::PERMISSION_NOT_PERSISTED)); - - ret = ErrorCodeConversion(INVALID_PARAMTER, errorResults, resultCodes); - EXPECT_EQ(ret, FileManagement::LibN::E_PARAMS); - - errorResults.push_back(true); - ret = ErrorCodeConversion(INVALID_PARAMTER, errorResults, resultCodes); - EXPECT_EQ(ret, EPERM); - - errorResults.clear(); - ret = ErrorCodeConversion(SANDBOX_MANAGER_OK, errorResults, resultCodes); - EXPECT_EQ(ret, EPERM); - - resultCodes.clear(); - ret = ErrorCodeConversion(SANDBOX_MANAGER_OK, errorResults, resultCodes); - EXPECT_EQ(ret, 0); - - int32_t UNKNOWN_ERROR = -114; - ret = ErrorCodeConversion(UNKNOWN_ERROR, errorResults, resultCodes); - EXPECT_EQ(ret, FileManagement::LibN::E_UNKNOWN_ERROR); - GTEST_LOG_(INFO) << "FileShareTest-end ErrorCodeConversion_test_002"; -} - #endif } // namespace AppFileService } // namespace OHOS \ No newline at end of file diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index f6ab1f601..3af83c7fb 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -308,7 +308,6 @@ ohos_unittest("b_jsonutil_other_test") { deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", - "${path_jsoncpp}:jsoncpp", "${path_googletest}:gmock_main", "${path_jsoncpp}:jsoncpp", ] -- Gitee From f2c661e7ea3537d4012881cfae1916a52c21af61 Mon Sep 17 00:00:00 2001 From: chensihan Date: Wed, 18 Sep 2024 11:18:14 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chensihan --- tests/unittests/backup_utils/BUILD.gn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index 3af83c7fb..2b543823f 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -294,7 +294,8 @@ ohos_unittest("b_jsonutil_other_test") { sources = [ "${path_backup}/tests/mock/cJson/src/cJsonMock.cpp", - "b_jsonutil/b_jsonutil_other_test.cpp", + "${path_backup}/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp", + "${path_backup}/utils/src/b_jsonutil/b_jsonutil.cpp", ] sources += backup_mock_parameter_src @@ -378,8 +379,8 @@ group("backup_test") { ":b_json_clear_data_test", ":b_json_other_test", ":b_json_test", - ":b_jsonutil_test", ":b_jsonutil_other_test", + ":b_jsonutil_test", ":b_process_test", ":b_tarball_cmdline_test", ":b_tarball_factory_test", -- Gitee From 40aea31c81d14191eac28920c6b3c11458fc046b Mon Sep 17 00:00:00 2001 From: chensihan Date: Wed, 18 Sep 2024 11:54:06 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dut=20Signed-off-by:=20c?= =?UTF-8?q?hensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index bd2f9d1a4..4602b5496 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -114,7 +114,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes EXPECT_FALSE(result); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); EXPECT_FALSE(result); @@ -250,7 +250,9 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS .WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)).WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); bool result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); -- Gitee From 0cb44a81758ad875ff0b6b9126da2c48e98bd037 Mon Sep 17 00:00:00 2001 From: chensihan Date: Wed, 18 Sep 2024 17:39:51 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chensihan --- .../backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index 4602b5496..170002925 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -114,7 +114,9 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes EXPECT_FALSE(result); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(Return(reinterpret_cast(&cjson)) + .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); EXPECT_FALSE(result); @@ -271,7 +273,9 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)) .WillOnce(Return(true)) .WillOnce(Return(true)); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); -- Gitee From 9ee98c996ba90969a02880e2b5334e672d9639db Mon Sep 17 00:00:00 2001 From: chensihan Date: Wed, 18 Sep 2024 19:05:18 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dut=20Signed-off-by:=20c?= =?UTF-8?q?hensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index 170002925..e3c5b247e 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -115,7 +115,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) - .WillOnce(Return(Return(reinterpret_cast(&cjson)) + .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); -- Gitee From a5355b2dad8376ee8da3f3336c9a7030390d9ab1 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 19 Sep 2024 09:31:39 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Signed-off-by:=20che?= =?UTF-8?q?nsihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index e3c5b247e..cd5928966 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -114,9 +114,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes EXPECT_FALSE(result); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) - .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); EXPECT_FALSE(result); -- Gitee From 3d8b25f8f3945cd3d459943750a0b03a71c3bb7f Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 19 Sep 2024 14:47:48 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dut=20Signed-off-by:=20c?= =?UTF-8?q?hensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index cd5928966..723f1b415 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -213,7 +213,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestS EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)).WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); -- Gitee From 7fe03840191947831f567cf66f4a789e7092e719 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 19 Sep 2024 15:40:48 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=20Si?= =?UTF-8?q?gned-off-by:=20chensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index 723f1b415..b6efe67a7 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -114,7 +114,10 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes EXPECT_FALSE(result); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(nullptr)) + .WillOnce(Return(nullptr)) + .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); EXPECT_FALSE(result); -- Gitee From 46b9624a87d768bebfdf788466c2913f07514ea5 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 19 Sep 2024 08:32:27 +0000 Subject: [PATCH 11/13] update tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp. Signed-off-by: chensihan --- .../b_jsonutil/b_jsonutil_other_test.cpp | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index b6efe67a7..a855cb44e 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -114,10 +114,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes EXPECT_FALSE(result); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) - .WillOnce(Return(nullptr)) - .WillOnce(Return(nullptr)) - .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildExtensionErrInfo(jsonStr, errFileInfo); EXPECT_FALSE(result); @@ -195,16 +192,16 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestS bool result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); - EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) - .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(nullptr); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(reinterpret_cast(&cjson))); + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); @@ -213,10 +210,12 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestS EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)).WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); @@ -248,14 +247,14 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)) .WillOnce(Return(true)) .WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)).WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) - .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); bool result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); @@ -264,6 +263,9 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)) .WillOnce(Return(true)) .WillOnce(Return(true)); @@ -271,14 +273,9 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)) - .WillOnce(Return(true)) - .WillOnce(Return(true)); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) - .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(nullptr)); - EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); result = BJsonUtil::BuildBundleInfoJson(userId, detailInfo); EXPECT_FALSE(result); } catch (...) { -- Gitee From 47eebf70ffadcffe0da8c5f3237347879161520f Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 19 Sep 2024 09:14:51 +0000 Subject: [PATCH 12/13] update tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp. Signed-off-by: chensihan --- .../backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index a855cb44e..07d09b856 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -265,7 +265,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS .WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(nullptr)); + .WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)) .WillOnce(Return(true)) .WillOnce(Return(true)); @@ -283,5 +283,5 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS GTEST_LOG_(INFO) << "BJsonUtilTest-an exception occurred."; } GTEST_LOG_(INFO) << "BJsonUtilTest-end BuildBundleInfoJson_0402"; - } +} } \ No newline at end of file -- Gitee From 5fad0136f97a4264d4cafcb38593020c380dcc41 Mon Sep 17 00:00:00 2001 From: chensihan Date: Fri, 20 Sep 2024 01:21:52 +0000 Subject: [PATCH 13/13] update tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp. Signed-off-by: chensihan --- .../unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index 07d09b856..5607da2f3 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -249,7 +249,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0402, testing::ext::TestS .WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_CreateArray()) .WillOnce(Return(reinterpret_cast(&cjson))) - .WillOnce(Return(nullptr)); + .WillOnce(Return(reinterpret_cast(&cjson))); EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)) .WillOnce(Return(true)) .WillOnce(Return(true)); -- Gitee