From 214bbb0681e7ca5436a95691bb7af50aa67be8ce Mon Sep 17 00:00:00 2001
From: z30034863 <zhangfengzhuang@huawei.com>
Date: Thu, 22 May 2025 16:58:31 +0800
Subject: [PATCH 1/2] fix 2MB tdd

Signed-off-by: z30034863 <zhangfengzhuang@huawei.com>
---
 .../unittest/app_packager_test/mock/mock_module_json_utils.cpp   | 1 +
 1 file changed, 1 insertion(+)

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 d03746a9..b7818da5 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
@@ -240,6 +240,7 @@ bool ModuleJsonUtils::GetHapVerifyInfosMapfromFileList(const std::list<std::stri
 bool ModuleJsonUtils::CheckAppAtomicServiceCompressedSizeValid(std::map<std::string, std::string> parameterMap,
     std::map<std::string, std::shared_ptr<HapVerifyInfo>>& hapVerifyInfoMap)
 {
+    return true;
     std::string packMode;
     std::string outPath;
     if (parameterMap.find(Constants::PARAM_MODE) == parameterMap.end() ||
-- 
Gitee


From a87f4a59d06c013effbac8a27559c2951c85bd5c Mon Sep 17 00:00:00 2001
From: z30034863 <zhangfengzhuang@huawei.com>
Date: Wed, 4 Jun 2025 11:51:02 +0800
Subject: [PATCH 2/2] fix tdd 20250604

Signed-off-by: z30034863 <zhangfengzhuang@huawei.com>
---
 .../app_packager_test/mock/mock_module_json_utils.cpp  |  6 ++++++
 .../app_packager_test/mock/mock_module_json_utils.h    | 10 ++++++++++
 2 files changed, 16 insertions(+)

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 b7818da5..710bd8b4 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<std::string>
 bool ModuleJsonUtils::GetHapVerifyInfosMapfromFileList(const std::list<std::string>& fileList,
     std::map<std::string, std::shared_ptr<HapVerifyInfo>>& hapVerifyInfoMap)
 {
+    if (MockModuleJsonUtils::mockGetHapVerifyInfosMapfromFileList_) {
+        return MockModuleJsonUtils::mockGetHapVerifyInfosMapfromFileListResult_;
+    }
+
     for (auto& hapPath : fileList) {
         if (hapPath.empty()) {
             LOGE("Hap file path is empty!");
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 5c1343be..98728173 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
-- 
Gitee