diff --git a/appexecfwk_lite/abilityms_posix/src/AbilityMgrTest2.cpp b/appexecfwk_lite/abilityms_posix/src/AbilityMgrTest2.cpp index a2ebbaa8803708e086fcf19557f116c7f3e2a722..179416a70db498910b2671b1b3af08f101f7b127 100755 --- a/appexecfwk_lite/abilityms_posix/src/AbilityMgrTest2.cpp +++ b/appexecfwk_lite/abilityms_posix/src/AbilityMgrTest2.cpp @@ -281,7 +281,7 @@ HWTEST_F(AbilityMgrTest2, testWantToUri, Function | MediumTest | Level0) ElementName element = { nullptr }; SetElementDeviceID(&element, "0001000"); SetElementBundleName(&element, "com.huawei.testnative"); - SetElementAbilityName(&element, "ServiceAbility"); + SetElementAbilityName(&element, "SecondAbility"); if (element.abilityName !=nullptr) { bool setResult = SetWantElement(&want, element); if (setResult) { diff --git a/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp b/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp index 03297835d488d91cc59c97fbd9bd9cfec7fcd5d3..c87ba98f40df04fc938e445bac69781b59002f28 100755 --- a/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp +++ b/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp @@ -1526,9 +1526,6 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2200, Security | MediumTest | Level1 // Step 9: Check the capability of process 'wms_server' or 'ai_server', pid = 9 ret = CapgetWithCaps(WMS_SERVER_OR_AI_SERVER_PID, WMS_SERVER_OR_AI_SERVER_CAP); EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 9, process wms_server or ai_server has wrong capability"; - // Step 10: Check the capability of process 'hiview', pid = 10 - ret = CapgetWithCaps(HIVIEW_PID, HIVIEW_CAP); - EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 10, process hiview has wrong capability"; } #endif @@ -1705,15 +1702,15 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2600, Performance | MediumTest | Lev // Preset action: Obtains the system time -> starttime clock_gettime(CLOCK_REALTIME, &starttime); // Step 1: Chown for 10000 times - for (int number = 0; number < NUM10000; number++) { + for (int number = 0; number < NUM1000; number++) { chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, number, number); } // Step 2: Obtains the system time again -> endtime clock_gettime(CLOCK_REALTIME, &endtime); // Step 3: Compare the starttime and the endtime -> tp tp = CompareTime(starttime, endtime); - EXPECT_LE(tp.tv_sec, NUM80) << "ErrInfo: Chown for 10000 times used " << tp.tv_sec << "." << tp.tv_nsec << "s"; + EXPECT_LE(tp.tv_sec, NUM80) << "ErrInfo: Chown for 1000 times used " << tp.tv_sec << "." << tp.tv_nsec << "s"; // Cleanup action: Restore the initial status of the file chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, UID0, GID0); } -#endif \ No newline at end of file +#endif diff --git a/security_lite/permission_posix/capability/vfat/BUILD.gn b/security_lite/permission_posix/capability/vfat/BUILD.gn index 20b53e21e9ec9df72b04e42037dad2c53aad562e..97fc283b9ce3470ed56718b9a251d265d69691f5 100755 --- a/security_lite/permission_posix/capability/vfat/BUILD.gn +++ b/security_lite/permission_posix/capability/vfat/BUILD.gn @@ -41,7 +41,7 @@ hcpptest_suite("ActsVFATCapabilityTest") { defines = [ "LITE_FS_VFAT", - "TOP_DIR=\"/userdata\"", - "TOP_DIR_MOUNT_INFO=\"/userdata vfat\"", + "TOP_DIR=\"/sdcard\"", + "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", ] }