From c7a334728b4238fb29a8827195d7f5b5521cb075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BD=B3=E4=BC=9F?= Date: Wed, 16 Jul 2025 15:52:37 +0800 Subject: [PATCH] =?UTF-8?q?Description:init=20UT=20=E6=95=B4=E6=94=B9=20Is?= =?UTF-8?q?sueNo:https://gitee.com/openharmony/startup=5Finit/issues/ICK2I?= =?UTF-8?q?G=20Binary=20Source:No=20Signed-off-by:=20songjiawei9=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erofs_overlay/erofs_remount_overlay.c | 12 ++++- .../include/erofs_remount_overlay.h | 9 ---- .../erofs/erofs_common_unittest.cpp | 4 +- .../fs_manager/erofs/erofs_mount_unittest.cpp | 11 +++-- .../erofs/erofs_remount_unittest.cpp | 46 +++++++++++++------ .../remount/remount_overlay_unittest.cpp | 6 ++- 6 files changed, 56 insertions(+), 32 deletions(-) diff --git a/interfaces/innerkits/fs_manager/erofs_overlay/erofs_remount_overlay.c b/interfaces/innerkits/fs_manager/erofs_overlay/erofs_remount_overlay.c index 6be12e10d..40b211163 100644 --- a/interfaces/innerkits/fs_manager/erofs_overlay/erofs_remount_overlay.c +++ b/interfaces/innerkits/fs_manager/erofs_overlay/erofs_remount_overlay.c @@ -22,8 +22,16 @@ #include "fs_manager/fs_manager.h" #include "erofs_remount_overlay.h" -#define DPA_MNT_PATH "/vendor/communication/dpa" -#define DPA_EXCHANGE_PATH "/mnt/dpa_exchange" +#define MODEM_DRIVER_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_driver" +#define MODEM_VENDOR_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_vendor" +#define MODEM_FW_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_fw" +#define MODEM_DRIVER_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/driver_exchange" +#define MODEM_VENDOR_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/vendor_exchange" +#define MODEM_FW_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/fw_exchange" +#define REMOUNT_RESULT_PATH STARTUP_INIT_UT_PATH"/data/service/el1/startup/remount/" +#define REMOUNT_RESULT_FLAG STARTUP_INIT_UT_PATH"/data/service/el1/startup/remount/remount.result.done" +#define DPA_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/communication/dpa" +#define DPA_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/dpa_exchange" int GetRemountResult(void) { diff --git a/interfaces/innerkits/fs_manager/erofs_overlay/include/erofs_remount_overlay.h b/interfaces/innerkits/fs_manager/erofs_overlay/include/erofs_remount_overlay.h index 99f6e3102..8a34cf792 100644 --- a/interfaces/innerkits/fs_manager/erofs_overlay/include/erofs_remount_overlay.h +++ b/interfaces/innerkits/fs_manager/erofs_overlay/include/erofs_remount_overlay.h @@ -24,15 +24,6 @@ extern "C" { #endif #endif -#define MODEM_DRIVER_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_driver" -#define MODEM_VENDOR_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_vendor" -#define MODEM_FW_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_fw" -#define MODEM_DRIVER_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/driver_exchange" -#define MODEM_VENDOR_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/vendor_exchange" -#define MODEM_FW_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/fw_exchange" -#define REMOUNT_RESULT_PATH STARTUP_INIT_UT_PATH"/data/service/el1/startup/remount/" -#define REMOUNT_RESULT_FLAG STARTUP_INIT_UT_PATH"/data/service/el1/startup/remount/remount.result.done" - #define REMOUNT_SUCC 0 #define REMOUNT_FAIL 1 diff --git a/test/unittest/fs_manager/erofs/erofs_common_unittest.cpp b/test/unittest/fs_manager/erofs/erofs_common_unittest.cpp index ee955d6fb..28a5c624c 100644 --- a/test/unittest/fs_manager/erofs/erofs_common_unittest.cpp +++ b/test/unittest/fs_manager/erofs/erofs_common_unittest.cpp @@ -13,11 +13,13 @@ * limitations under the License. */ +#include #include "erofs_overlay_common.h" -#include "securec.h" #include "param_stub.h" + using namespace std; using namespace testing::ext; + namespace init_ut { class ErofsCommonOverlayUnitTest : public testing::Test { public: diff --git a/test/unittest/fs_manager/erofs/erofs_mount_unittest.cpp b/test/unittest/fs_manager/erofs/erofs_mount_unittest.cpp index 585d71504..1187e534d 100644 --- a/test/unittest/fs_manager/erofs/erofs_mount_unittest.cpp +++ b/test/unittest/fs_manager/erofs/erofs_mount_unittest.cpp @@ -12,12 +12,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include #include "erofs_mount_overlay.h" -#include "securec.h" #include "param_stub.h" #include "init_utils.h" + using namespace std; using namespace testing::ext; + namespace init_ut { class ErofsMountUnitTest : public testing::Test { public: @@ -26,14 +29,17 @@ public: void SetUp(void) {}; void TearDown(void) {}; }; + HWTEST_F(ErofsMountUnitTest, Init_AllocDmName_001, TestSize.Level0) { char nameExt4[MAX_BUFFER_LEN] = {0}; char nameRofs[MAX_BUFFER_LEN] = {0}; const char *devName = STARTUP_INIT_UT_PATH"/data/erofs/mount/rofs"; AllocDmName(devName, nameRofs, MAX_BUFFER_LEN, nameExt4, MAX_BUFFER_LEN); - EXPECT_STRNE(nameExt4, nameRofs); + EXPECT_STREQ("_data_init_ut_data_erofs_mount_rofs_erofs", nameRofs); + EXPECT_STREQ("_data_init_ut_data_erofs_mount_rofs_ext4", nameExt4); } + HWTEST_F(ErofsMountUnitTest, Init_LookupErofsEnd_001, TestSize.Level0) { const char *devMount = STARTUP_INIT_UT_PATH"/data/erofs/mount/lookup"; @@ -65,5 +71,4 @@ HWTEST_F(ErofsMountUnitTest, Init_LookupErofsEnd_001, TestSize.Level0) EXPECT_NE(ret, 0); remove(devMount); } - } \ No newline at end of file diff --git a/test/unittest/fs_manager/erofs/erofs_remount_unittest.cpp b/test/unittest/fs_manager/erofs/erofs_remount_unittest.cpp index c2dee2037..6b5c6018b 100644 --- a/test/unittest/fs_manager/erofs/erofs_remount_unittest.cpp +++ b/test/unittest/fs_manager/erofs/erofs_remount_unittest.cpp @@ -13,12 +13,25 @@ * limitations under the License. */ +#include #include "erofs_remount_overlay.h" -#include "securec.h" #include "param_stub.h" #include "fs_manager.h" + +#define MODEM_DRIVER_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_driver" +#define MODEM_VENDOR_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_vendor" +#define MODEM_FW_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/modem/modem_fw" +#define MODEM_DRIVER_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/driver_exchange" +#define MODEM_VENDOR_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/vendor_exchange" +#define MODEM_FW_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/fw_exchange" +#define REMOUNT_RESULT_PATH STARTUP_INIT_UT_PATH"/data/service/el1/startup/remount/" +#define REMOUNT_RESULT_FLAG STARTUP_INIT_UT_PATH"/data/service/el1/startup/remount/remount.result.done" +#define DPA_MNT_PATH STARTUP_INIT_UT_PATH"/vendor/communication/dpa" +#define DPA_EXCHANGE_PATH STARTUP_INIT_UT_PATH"/mnt/dpa_exchange" + using namespace std; using namespace testing::ext; + namespace init_ut { class ErofsRemountUnitTest : public testing::Test { public: @@ -31,10 +44,10 @@ public: HWTEST_F(ErofsRemountUnitTest, Init_GetRemountResult_001, TestSize.Level0) { rmdir(REMOUNT_RESULT_PATH); + RemountOverlay(); SetRemountResultFlag(); - - CheckAndCreateDir(REMOUNT_RESULT_FLAG); - SetRemountResultFlag(); + int ret = GetRemountResult(); + EXPECT_EQ(ret, 0); rmdir(REMOUNT_RESULT_PATH); } @@ -88,20 +101,23 @@ HWTEST_F(ErofsRemountUnitTest, Init_ExchangeToMode_001, TestSize.Level0) HWTEST_F(ErofsRemountUnitTest, Init_OverlayRemountVendorPre_001, TestSize.Level0) { - CheckAndCreateDir(MODEM_DRIVER_MNT_PATH); - CheckAndCreateDir(MODEM_VENDOR_MNT_PATH); - CheckAndCreateDir(MODEM_FW_MNT_PATH); + CheckAndCreateDir(MODEM_DRIVER_MNT_PATH"/"); + CheckAndCreateDir(MODEM_VENDOR_MNT_PATH"/"); + CheckAndCreateDir(MODEM_FW_MNT_PATH"/"); + CheckAndCreateDir(DPA_MNT_PATH"/"); + CheckAndCreateDir(STARTUP_INIT_UT_PATH"/mnt/"); + OverlayRemountVendorPre(); + EXPECT_EQ(access(MODEM_DRIVER_MNT_PATH, F_OK), 0); + EXPECT_EQ(access(MODEM_DRIVER_EXCHANGE_PATH, F_OK), 0); + OverlayRemountVendorPost(); + rmdir(MODEM_DRIVER_MNT_PATH); rmdir(MODEM_VENDOR_MNT_PATH); rmdir(MODEM_FW_MNT_PATH); - - OverlayRemountVendorPost(); -} - -HWTEST_F(ErofsRemountUnitTest, Init_RemountOverlayTest_001, TestSize.Level0) -{ - int ret = RemountOverlay(); - EXPECT_EQ(ret, 0); + rmdir(MODEM_DRIVER_EXCHANGE_PATH); + rmdir(MODEM_VENDOR_EXCHANGE_PATH); + rmdir(MODEM_FW_EXCHANGE_PATH); + rmdir(DPA_EXCHANGE_PATH); } } \ No newline at end of file diff --git a/test/unittest/remount/remount_overlay_unittest.cpp b/test/unittest/remount/remount_overlay_unittest.cpp index 6ac34bd08..b6836381b 100644 --- a/test/unittest/remount/remount_overlay_unittest.cpp +++ b/test/unittest/remount/remount_overlay_unittest.cpp @@ -13,12 +13,14 @@ * limitations under the License. */ +#include #include "remount_overlay.h" -#include "securec.h" #include "param_stub.h" #include "mntent.h" + using namespace std; using namespace testing::ext; + namespace init_ut { class RemountOverlayUnitTest : public testing::Test { public: @@ -107,6 +109,7 @@ HWTEST_F(RemountOverlayUnitTest, Init_GetDevSizeTest_001, TestSize.Level0) EXPECT_NE(ret, 0); remove(fileName); } + HWTEST_F(RemountOverlayUnitTest, Init_FormatExt4Test_001, TestSize.Level0) { const char *fileName = ""; @@ -122,5 +125,4 @@ HWTEST_F(RemountOverlayUnitTest, Init_FormatExt4Test_001, TestSize.Level0) EXPECT_NE(ret, 0); remove(fileName); } - } \ No newline at end of file -- Gitee