diff --git a/test/unittest/init/mount_unittest.cpp b/test/unittest/init/mount_unittest.cpp index 4dc5c5f6d82d8e66f0d91b4a6170115d3cff89f8..30975540667ab25ef600aa7f82f810145133c699 100644 --- a/test/unittest/init/mount_unittest.cpp +++ b/test/unittest/init/mount_unittest.cpp @@ -47,7 +47,7 @@ HWTEST_F(MountUnitTest, TestMountRequriedPartitions, TestSize.Level0) int ret = MountRequriedPartitions(&fstab1); EXPECT_EQ(ret, -1); } - LoadRequiredFstab(); + ReleaseFstab(LoadRequiredFstab()); } HWTEST_F(MountUnitTest, TestGetBlockDevicePath, TestSize.Level1) { diff --git a/test/unittest/innerkits/innerkits_unittest.cpp b/test/unittest/innerkits/innerkits_unittest.cpp index 32fba53094242c067b7cb90006e72db388415201..01a13aad172641270613d06351a7641002e604f0 100644 --- a/test/unittest/innerkits/innerkits_unittest.cpp +++ b/test/unittest/innerkits/innerkits_unittest.cpp @@ -136,4 +136,15 @@ HWTEST_F(InnerkitsUnitTest, GetBlockDevicePath_unittest, TestSize.Level1) EXPECT_EQ(GetBlockDevicePath("/misc", devicePath, MAX_BUFFER_LEN), 0); EXPECT_EQ(GetBlockDevicePath("/invalid", devicePath, MAX_BUFFER_LEN), -1); } + +HWTEST_F(InnerkitsUnitTest, DoFormat_unittest, TestSize.Level1) +{ + EXPECT_NE(DoFormat("/testpath", "ext4"), 1); + EXPECT_NE(DoFormat("/testpath", "f2fs"), 1); +} + +HWTEST_F(InnerkitsUnitTest, MountAllWithFstabFile_unittest, TestSize.Level1) +{ + EXPECT_NE(MountAllWithFstabFile("/etc/fstab.required", 0), 1); +} } // namespace init_ut diff --git a/test/unittest/param/param_stub.cpp b/test/unittest/param/param_stub.cpp index 2faafae9c70f8313895dc2087d48fea4c9a6d6a7..14ed97ab26ba937ece70d311c227c15475985e29 100644 --- a/test/unittest/param/param_stub.cpp +++ b/test/unittest/param/param_stub.cpp @@ -205,9 +205,16 @@ static void PrepareInnerKitsCfg() "aa aa\n" "aa aa aa\n" "aa aa aa aa\n"; + const char *fstabRequired = "# fstab file.\n" + "# \n" + "/dev/block/platform/fe310000.sdhci/by-name/testsystem /usr ext4 ro,barrier=1 wait,required\n" + "/dev/block/platform/fe310000.sdhci/by-name/testvendor /vendor ext4 ro,barrier=1 wait,required\n" + "/dev/block/platform/fe310000.sdhci/by-name/testuserdata1 /data f2fs noatime,nosuid,nodev wait,check,quota\n" + "/dev/block/platform/fe310000.sdhci/by-name/testuserdata2 /data ext4 noatime,fscrypt=xxx wait,check,quota\n" + "/dev/block/platform/fe310000.sdhci/by-name/testmisc /misc none none wait,required"; mkdir("/data/init_ut/mount_unitest/", S_IRWXU | S_IRWXG | S_IRWXO); CreateTestFile("/data/init_ut/mount_unitest/ReadFstabFromFile1.fstable", innerKitsCfg); - CreateTestFile("/etc/fstab.required", "test"); + CreateTestFile("/etc/fstab.required", fstabRequired); } static void PrepareGroupTestCfg() { diff --git a/test/unittest/tools/prepare_testdata.sh b/test/unittest/tools/prepare_testdata.sh index 52ca25bbeb00b40f13f62bd075fb29cf4b602545..e3081bd6f47aad13cd9104239bd1bee0c5ef1f10 100755 --- a/test/unittest/tools/prepare_testdata.sh +++ b/test/unittest/tools/prepare_testdata.sh @@ -130,7 +130,7 @@ fi echo "Filter out don\'t cared dir" lcov --remove init_ut_tmp.info "*foundation*" "*init/adapter/init_adapter.c*" "*third_party*" \ "*device.c*" "*prebuilts*" "*test/unittest/*" "*utils/native/*" "*utils/system/*" \ - "*init.c*" "*init_signal_handler.c*" "*fstab_mount.c*" "*ueventd.c*" \ + "*init.c*" "*init_signal_handler.c*" "*ueventd.c*" \ "*ueventd_device_handler.c*" "*ueventd_firmware_handler.c*" "*ueventd_socket.c*" -o ${ohos_init}/init_ut.info genhtml -o ${HOME}/init_coverage init_ut.info