diff --git a/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.cpp b/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.cpp index d03746a9082f1813e88c10dd51bdd99666915dd6..710bd8b4f67bacc7f350c9654643270d68da3248 100644 --- a/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.cpp +++ b/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.cpp @@ -37,6 +37,8 @@ bool MockModuleJsonUtils::mockCheckHapsIsValid_ = false; bool MockModuleJsonUtils::mockIsModuleHap_ = false; bool MockModuleJsonUtils::mockCheckHapsIsValidResult_ = false; bool MockModuleJsonUtils::mockIsModuleHapResult_ = false; +bool MockModuleJsonUtils::mockGetHapVerifyInfosMapfromFileList_ = false; +bool MockModuleJsonUtils::mockGetHapVerifyInfosMapfromFileListResult_ = false; ResultSeries MockModuleJsonUtils::mockGetStageHapVerifyInfoResultSeries_; ResultSeries::const_iterator MockModuleJsonUtils::mockGetStageHapVerifyInfoResultSeriesIter_ = mockGetStageHapVerifyInfoResultSeries_.cbegin(); @@ -204,6 +206,10 @@ bool ModuleJsonUtils::GetHapVerifyInfosfromFileList(const std::list bool ModuleJsonUtils::GetHapVerifyInfosMapfromFileList(const std::list& fileList, std::map>& hapVerifyInfoMap) { + if (MockModuleJsonUtils::mockGetHapVerifyInfosMapfromFileList_) { + return MockModuleJsonUtils::mockGetHapVerifyInfosMapfromFileListResult_; + } + for (auto& hapPath : fileList) { if (hapPath.empty()) { LOGE("Hap file path is empty!"); @@ -240,6 +246,7 @@ bool ModuleJsonUtils::GetHapVerifyInfosMapfromFileList(const std::list parameterMap, std::map>& hapVerifyInfoMap) { + return true; std::string packMode; std::string outPath; if (parameterMap.find(Constants::PARAM_MODE) == parameterMap.end() || diff --git a/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.h b/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.h index 5c1343bee8b17133e12f6fce7d81cbba67a2137d..98728173ae39474ac6da2bde80f222ac096c0b5b 100644 --- a/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.h +++ b/packing_tool/frameworks/test/unittest/app_packager_test/mock/mock_module_json_utils.h @@ -32,6 +32,8 @@ public: static bool mockIsModuleHap_; static bool mockCheckHapsIsValidResult_; static bool mockIsModuleHapResult_; + static bool mockGetHapVerifyInfosMapfromFileList_; + static bool mockGetHapVerifyInfosMapfromFileListResult_; static ResultSeries mockGetStageHapVerifyInfoResultSeries_; static ResultSeries::const_iterator mockGetStageHapVerifyInfoResultSeriesIter_; static ResultSeries mockGetFaHapVerifyInfoResultSeries_; @@ -46,6 +48,8 @@ public: mockIsModuleHap_ = false; mockCheckHapsIsValidResult_ = false; mockIsModuleHapResult_ = false; + mockGetHapVerifyInfosMapfromFileList_ = false; + mockGetHapVerifyInfosMapfromFileListResult_ = false; mockGetStageHapVerifyInfoResultSeries_.clear(); mockGetStageHapVerifyInfoResultSeriesIter_ = mockGetStageHapVerifyInfoResultSeries_.cbegin(); mockGetFaHapVerifyInfoResultSeries_.clear(); @@ -91,6 +95,12 @@ public: mockIsModuleHap_ = true; mockIsModuleHapResult_ = result; } + + static void MockCheckHapsIsValid(const bool result) + { + mockGetHapVerifyInfosMapfromFileList_ = true; + mockGetHapVerifyInfosMapfromFileListResult_ = result; + } }; } // namespace OHOS #endif // MOCK_MODULE_JSON_UTILS_H \ No newline at end of file