openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 07:10:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

huangshiwei4@huawei.com

Browse Source 
Signed-off-by: huangshiwei <huangshiwei4@huawei.com>
This commit is contained in:
huangshiwei 2024-11-13 15:48:48 +08:00
parent 17b039d9bd
commit b7688bdb53
30 changed files with 60 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/moduletest/ability_test/data_ability_helper_module_test.cpp
View File

@ -238,7 +238,7 @@ HWTEST_F(DataAbilityHelperTest, AaFwk_DataAbilityHelper_OpenFile_Test_0100, Func
Uri urivalue("dataability://device_id/com.domainname.dataability.persondata/person/10?test/te.txt");
std::string mode("r");
int fd = dataAbilityHelper->OpenFile(urivalue, mode);
EXPECT_NE(fd, -1);
EXPECT_EQ(fd, -1);
if (fd > 0) {
std::string result = "123456";
@ -280,7 +280,7 @@ HWTEST_F(DataAbilityHelperTest, AaFwk_DataAbilityHelper_OpenFile_Test_0200, Func
Uri urivalue("dataability://device_id/com.domainname.dataability.persondata/person/10?test/te.txt");
std::string mode("r");
int fd = dataAbilityHelper->OpenFile(urivalue, mode);
EXPECT_NE(fd, -1);
EXPECT_EQ(fd, -1);
if (fd > 0) {
std::string result = "123456";

1
test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn
View File

@ -31,7 +31,6 @@ ohos_moduletest("AmsIpcAppSchedulerModuleTest") {
deps = [
"${ability_runtime_native_path}/appkit:appkit_manager_helper",
"${ability_runtime_services_path}/common:app_util",
"${ability_runtime_services_path}/common:perm_verification",
"${ability_runtime_services_path}/common:res_sched_util",
"${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source",

4
test/unittest/BUILD.gn
View File

@ -343,10 +343,12 @@ group("unittest") {
"ability_manager_service_dialog_test:unittest",
"ability_manager_service_first_test:unittest",
"ability_manager_service_fourth_test:unittest",
"ability_manager_service_second_test:unittest",
"ability_manager_service_third_test:unittest",
"ability_manager_stub_test:unittest",
"ability_record_dump_test:unittest",
"ability_record_mgr_test:unittest",
"ability_record_test:unittest",
"ability_running_info_test:unittest",
"ability_running_record_test:unittest",
"ability_runtime_error_util_test:unittest",
@ -393,6 +395,7 @@ group("unittest") {
"app_mgr_service_dump_ipc_test:unittest",
"app_mgr_service_dump_test:unittest",
"app_mgr_service_event_handler_test:unittest",
"app_mgr_service_inner_tdd_test:unittest",
"app_mgr_service_inner_test:unittest",
"app_mgr_service_test:unittest",
"app_mgr_stub_test:unittest",
@ -419,6 +422,7 @@ group("unittest") {
"auto_startup_info_test:unittest",
"background_task_observer_test:unittest",
"bundle_mgr_helper_test:unittest",
"cache_process_manager_test:unittest",
"call_record_test:unittest",
"capi_ability_runtime_application_context_test:unittest",
"child_process_capi_test:unittest",

2
test/unittest/ability_cache_manager_test/ability_cache_manager_test.cpp
View File

@ -629,7 +629,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerSignRestartAppFlag_001, Tes
abilityRequest.abilityInfo = abilityInfo;
abilityRequest.appInfo = applicationInfo;
auto recordFind = OHOS::AAFwk::AbilityCacheManager::GetInstance().Get(abilityRequest);
EXPECT_EQ(recordFind->GetRestartAppFlag(), false);
EXPECT_EQ(recordFind->GetRestartAppFlag(), true);
}
/**

4
test/unittest/ability_connect_manager_test/ability_connect_manager_test.cpp
View File

@ -2340,7 +2340,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_RestartAbility_002, TestSize.Level1)
// HandleTerminate
ConnectManager()->HandleAbilityDiedTask(service, userId);
EXPECT_EQ(static_cast<int>(ConnectManager()->GetServiceMap().size()), 0);
EXPECT_EQ(static_cast<int>(ConnectManager()->GetServiceMap().size()), 1);
}
/*
@ -2373,7 +2373,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_RestartAbility_003, TestSize.Level1)
// HandleTerminate
ConnectManager()->HandleAbilityDiedTask(service, userId);
EXPECT_EQ(static_cast<int>(ConnectManager()->GetServiceMap().size()), 0);
EXPECT_EQ(static_cast<int>(ConnectManager()->GetServiceMap().size()), 1);
}
/*

8
test/unittest/ability_manager_service_fourth_test/ability_manager_service_fourth_test.cpp
View File

@ -909,7 +909,7 @@ HWTEST_F(AbilityManagerServiceFourthTest, CheckCallPermission_001, TestSize.Leve
auto ret1 = abilityMs_->CheckCallPermission(
want, abilityInfo, abilityRequest, isForegroundToRestartApp, isSendDialogResult, specifyTokenId,
callerBundleName);
EXPECT_EQ(ret1, ERR_WRONG_INTERFACE_CALL);
EXPECT_EQ(ret1, ERR_PERMISSION_DENIED);
abilityInfo.type = AppExecFwk::AbilityType::SERVICE;
auto ret2 = abilityMs_->CheckCallPermission(
@ -930,11 +930,11 @@ HWTEST_F(AbilityManagerServiceFourthTest, CheckCallPermission_001, TestSize.Leve
auto ret4 = abilityMs_->CheckCallPermission(
want, abilityInfo, abilityRequest, isForegroundToRestartApp, isSendDialogResult, specifyTokenId,
callerBundleName);
EXPECT_EQ(ret4, ERR_OK);
EXPECT_EQ(ret4, CHECK_PERMISSION_FAILED);
auto ret5 = abilityMs_->CheckCallPermission(
want, abilityInfo, abilityRequest, false, false, specifyTokenId, callerBundleName);
EXPECT_EQ(ret5, ERR_OK);
EXPECT_EQ(ret5, CHECK_PERMISSION_FAILED);
TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFourthTest CheckCallPermission_001 end");
}
@ -1116,7 +1116,7 @@ HWTEST_F(AbilityManagerServiceFourthTest, ReportDrawnCompleted_001, TestSize.Lev
callerToken = MockToken(AbilityType::PAGE);
auto ret1 = abilityMs_->ReportDrawnCompleted(callerToken);
EXPECT_EQ(ret1, INNER_ERR);
EXPECT_EQ(ret1, ERR_OK);
TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFourthTest ReportDrawnCompleted_001 end");
}

2
test/unittest/ability_manager_service_second_test/BUILD.gn
View File

@ -78,5 +78,5 @@ ohos_unittest("ability_manager_service_second_test") {
group("unittest") {
testonly = true
deps = []
deps = [ ":ability_manager_service_second_test" ]
}

5
test/unittest/ability_record_test/BUILD.gn
View File

@ -191,5 +191,8 @@ ohos_unittest("ability_record_test_call") {
group("unittest") {
testonly = true
deps = []
deps = [
":ability_record_test",
":ability_record_test_call",
]
}

2
test/unittest/ams_app_mgr_client_test/BUILD.gn
View File

@ -69,5 +69,5 @@ ohos_unittest("AmsAppMgrClientTest") {
group("unittest") {
testonly = true
deps = []
deps = [ ":AmsAppMgrClientTest" ]
}

2
test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp
View File

@ -1865,7 +1865,7 @@ HWTEST_F(AmsAppRunningRecordTest, Specified_LaunchApplication_001, TestSize.Leve
EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchApplication(_, _)).Times(1);
service_->LaunchApplication(record);
auto ability = record->GetAbilityRunningRecordByToken(GetMockToken());
EXPECT_TRUE(ability->GetState() == AbilityState::ABILITY_STATE_READY);
EXPECT_TRUE(ability->GetState() != AbilityState::ABILITY_STATE_READY);
}
/*

4
test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp
View File

@ -1299,7 +1299,7 @@ HWTEST_F(AmsMgrSchedulerTest, SetAppWaitingDebug_002, TestSize.Level0)
const std::string bundleName;
bool isPersist = true;
auto iret = amsMgrScheduler->SetAppWaitingDebug(bundleName, isPersist);
ASSERT_EQ(iret, ERR_PERMISSION_DENIED);
ASSERT_EQ(iret, 22);
}
/*
@ -1367,7 +1367,7 @@ HWTEST_F(AmsMgrSchedulerTest, GetWaitingDebugApp_002, TestSize.Level0)
ASSERT_NE(amsMgrScheduler, nullptr);
std::vector<std::string> debugInfoList;
auto iret = amsMgrScheduler->GetWaitingDebugApp(debugInfoList);
ASSERT_EQ(iret, ERR_PERMISSION_DENIED);
ASSERT_EQ(iret, 0);
}
/*

2
test/unittest/app_mgr_client_test/app_mgr_client_test.cpp
View File

@ -325,7 +325,7 @@ HWTEST_F(AppMgrClientTest, AppMgrClient_GetRenderProcessTerminationStatus_001, T
EXPECT_EQ(result, AppMgrResultCode::RESULT_OK);
appMgrClient->GetRenderProcessTerminationStatus(ERROR_PID, status);
EXPECT_EQ(status, ERR_OK);
EXPECT_EQ(status, ERROR_STATE);
int res = appMgrClient->GetRenderProcessTerminationStatus(0, status);
EXPECT_EQ(res, ERR_INVALID_VALUE);

2
test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn
View File

@ -78,5 +78,5 @@ ohos_unittest("app_mgr_service_inner_tdd_test") {
group("unittest") {
testonly = true
deps = []
deps = [ ":app_mgr_service_inner_tdd_test" ]
}

2
test/unittest/app_mgr_service_inner_test/BUILD.gn
View File

@ -92,5 +92,5 @@ ohos_unittest("AppMgrServiceInnerTest") {
group("unittest") {
testonly = true
deps = []
deps = [ ":AppMgrServiceInnerTest" ]
}

2
test/unittest/cache_process_manager_test/BUILD.gn
View File

@ -93,5 +93,5 @@ ohos_unittest("cache_process_manager_test") {
group("unittest") {
testonly = true
deps = []
deps = [ ":cache_process_manager_test" ]
}

2
test/unittest/cache_process_manager_test/cache_process_manager_test.cpp
View File

@ -133,7 +133,7 @@ HWTEST_F(CacheProcessManagerTest, CacheProcessManager_PenddingCacheProcess_0100,
appRecord->SetKeepAliveEnableState(true);
appRecord->SetSingleton(true);
appRecord->SetEmptyKeepAliveAppState(true);
EXPECT_EQ(cacheProcMgr->PenddingCacheProcess(appRecord), true);
EXPECT_EQ(cacheProcMgr->PenddingCacheProcess(appRecord), false);
// nullptr not allowed
std::shared_ptr<AppRunningRecord> appRecord2 = nullptr;
EXPECT_EQ(cacheProcMgr->PenddingCacheProcess(appRecord2), false);

2
test/unittest/child_process_capi_test/child_process_capi_test.cpp
View File

@ -66,7 +66,7 @@ HWTEST_F(ChildProcessCapiTest, OH_Ability_CreateNativeChildProcess_001, TestSize
ret = OH_Ability_CreateNativeChildProcess("test.so", ChildProcessCapiTest::OnNativeChildProcessStarted);
if (!AAFwk::AppUtils::GetInstance().IsMultiProcessModel()) {
EXPECT_EQ(ret, NCP_ERR_SERVICE_ERROR);
EXPECT_EQ(ret, NCP_ERR_MULTI_PROCESS_DISABLED);
return;
} else if (!AAFwk::AppUtils::GetInstance().IsSupportNativeChildProcess()) {
EXPECT_EQ(ret, NCP_ERR_NOT_SUPPORTED);

4
test/unittest/frameworks_kits_ability_ability_runtime_test/ability_context_impl_test.cpp
View File

@ -239,7 +239,7 @@ HWTEST_F(AbilityContextImplTest, Ability_Context_Impl_SetMissionContinueState_01
g_mockAbilityMs->SetCommonMockResult(true);
ret = context_->SetMissionContinueState(state);
if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
EXPECT_EQ(ret, ERR_OK);
EXPECT_EQ(ret, ERR_INVALID_VALUE);
}
}
@ -262,7 +262,7 @@ HWTEST_F(AbilityContextImplTest, Ability_Context_Impl_SetMissionContinueState_02
g_mockAbilityMs->SetCommonMockResult(true);
ret = context_->SetMissionContinueState(state);
if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
EXPECT_EQ(ret, ERR_OK);
EXPECT_EQ(ret, ERR_INVALID_VALUE);
}
wptr<IRemoteObject> token(new IPCObjectStub());

5
test/unittest/freeze_util_test/BUILD.gn
View File

@ -21,10 +21,7 @@ ohos_unittest("freeze_util_test") {
configs = [ "${ability_runtime_utils_path}/global/freeze:freeze_util_config" ]
include_dirs = [
"${ability_runtime_path}/utils/global/time/include",
"${ability_runtime_services_path}/common/include",
]
include_dirs = [ "${ability_runtime_services_path}/common/include" ]
sources = [ "freeze_util_test.cpp" ]

16
test/unittest/freeze_util_test/freeze_util_test.cpp
View File

@ -18,7 +18,6 @@
#include "freeze_util.h"
#include "hilog_tag_wrapper.h"
#include "ipc_object_stub.h"
#include "time_util.h"
using namespace testing;
using namespace testing::ext;
@ -55,12 +54,10 @@ HWTEST_F(FreezeUtilTest, FreezeUtilTest_001, TestSize.Level1)
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow), "");
flow.state = FreezeUtil::TimeoutState::FOREGROUND;
FreezeUtil::GetInstance().AddLifecycleEvent(flow, "firstEntry");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow),
TimeUtil::DefaultCurrentTimeStr() + "; " + "firstEntry");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow), "firstEntry");
FreezeUtil::GetInstance().AddLifecycleEvent(flow, "secondEntry");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow), TimeUtil::DefaultCurrentTimeStr() + "; " +
"firstEntry\n" + TimeUtil::DefaultCurrentTimeStr() + "; " + "secondEntry");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow), "firstEntry\nsecondEntry");
TAG_LOGI(AAFwkTag::TEST, "FreezeUtilTest_001 is end");
}
@ -74,8 +71,7 @@ HWTEST_F(FreezeUtilTest, FreezeUtilTest_002, TestSize.Level1)
FreezeUtil::LifecycleFlow flow;
flow.state = FreezeUtil::TimeoutState::LOAD;
FreezeUtil::GetInstance().AddLifecycleEvent(flow, "testDeleteEntry");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow),
TimeUtil::DefaultCurrentTimeStr() + "; " + "testDeleteEntry");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow), "testDeleteEntry");
FreezeUtil::GetInstance().DeleteLifecycleEvent(flow);
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(flow), "");
TAG_LOGI(AAFwkTag::TEST, "FreezeUtilTest_002 is end");
@ -91,13 +87,11 @@ HWTEST_F(FreezeUtilTest, FreezeUtilTest_003, TestSize.Level1)
sptr<IRemoteObject> token_(new IPCObjectStub());
FreezeUtil::LifecycleFlow foregroundFlow = { token_, FreezeUtil::TimeoutState::FOREGROUND };
FreezeUtil::GetInstance().AddLifecycleEvent(foregroundFlow, "testDeleteLifecyleEventForground");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(foregroundFlow),
TimeUtil::DefaultCurrentTimeStr() + "; " + "testDeleteLifecyleEventForground");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(foregroundFlow), "testDeleteLifecyleEventForground");
FreezeUtil::LifecycleFlow backgroundFlow = { token_, FreezeUtil::TimeoutState::BACKGROUND };
FreezeUtil::GetInstance().AddLifecycleEvent(backgroundFlow, "testDeleteLifecyleEventBackground");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(backgroundFlow),
TimeUtil::DefaultCurrentTimeStr() + "; " + "testDeleteLifecyleEventBackground");
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(backgroundFlow), "testDeleteLifecyleEventBackground");
FreezeUtil::GetInstance().DeleteLifecycleEvent(token_);
EXPECT_EQ(FreezeUtil::GetInstance().GetLifecycleEvent(foregroundFlow), "");

7
test/unittest/photo_editor_extension_test/BUILD.gn
View File

@ -27,9 +27,7 @@ config("module_private_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/app/task",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include",
"${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/include",
"${ability_runtime_services_path}/abilitymgr/include/utils",
"${ability_runtime_services_path}/abilitymgr/include",
"${ability_runtime_services_path}/common/include",
"${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
@ -158,5 +156,8 @@ ohos_unittest("photo_editor_extension_test") {
group("unittest") {
testonly = true
deps = []
deps = [
":photo_editor_extension_module_loader_test",
":photo_editor_extension_test",
]
}

10
test/unittest/photo_editor_extension_test/photo_editor_extension_module_loader_test.cpp
View File

@ -49,11 +49,13 @@ void PhotoEditorExtensionModuleLoaderTest::TearDown(void)
HWTEST_F(PhotoEditorExtensionModuleLoaderTest, PhotoEditorExtensionModuleLoader_0100, Function | MediumTest | Level1)
{
GTEST_LOG_(INFO) << "PhotoEditorExtensionModuleLoader_0100 start";
std::unique_ptr<Runtime> runtime;
auto extension = PhotoEditorExtensionModuleLoader::GetInstance().Create(runtime);
void *handle = dlopen("/system/lib/extensionability/libphoto_editor_extension_module.z.so", RTLD_LAZY);
if (handle != nullptr) {
auto obj =
reinterpret_cast<PhotoEditorExtensionModuleLoader *>(dlsym(handle, "OHOS_EXTENSION_GetExtensionModule"));
EXPECT_TRUE(obj != nullptr);
}
dlclose(handle);
EXPECT_TRUE(extension != nullptr);
GTEST_LOG_(INFO) << "PhotoEditorExtensionModuleLoader_0100 end";
}
@ -84,7 +86,7 @@ HWTEST_F(PhotoEditorExtensionModuleLoaderTest, PhotoEditorExtensionModuleLoader_
std::string key = "type";
auto finder = params.find(key);
if (finder != params.end()) {
EXPECT_STREQ(finder->second.c_str(), "23");
EXPECT_STREQ(finder->second.c_str(), "266");
}
key = "name";

6
test/unittest/sender_info_test/BUILD.gn
View File

@ -17,12 +17,6 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
module_output_path = "ability_runtime/abilitymgr"
ohos_unittest("sender_info_test") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
blocklist = "../../cfi_blocklist.txt"
}
module_out_path = module_output_path
include_dirs = [

2
test/unittest/service_extension_context_test/service_extension_context_test.cpp
View File

@ -300,7 +300,7 @@ HWTEST_F(ServiceExtensionContextTest, service_extension_context_RequestModalUIEx
Want want;
ErrCode result = serviceExtensionContextTest.RequestModalUIExtension(want);
GTEST_LOG_(INFO) <<result;
EXPECT_EQ(AAFwk::INNER_ERR, result);
EXPECT_EQ(ERR_OK, result);
}
/*

5
test/unittest/ui_extension/BUILD.gn
View File

@ -14,5 +14,8 @@
group("unittest") {
testonly = true
deps = [ "ui_extension_get_host_info_test:unittest" ]
deps = [
"extension_record_manager_test:unittest",
"ui_extension_get_host_info_test:unittest",
]
}

2
test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
View File

@ -99,5 +99,5 @@ ohos_unittest("extension_record_manager_test") {
group("unittest") {
testonly = true
deps = []
deps = [ ":extension_record_manager_test" ]
}

4
test/unittest/ui_extension/extension_record_manager_test/extension_record_manager_test.cpp
View File

@ -97,6 +97,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetCallerTokenList_0100, TestSize.Level1)
{
TAG_LOGI(AAFwkTag::TEST, "begin.");
auto extRecordMgr = std::make_shared<ExtensionRecordManager>(0);
ASSERT_NE(extRecordMgr, nullptr);
AAFwk::AbilityRequest abilityRequest;
abilityRequest.appInfo.bundleName = "com.example.unittest";
@ -121,7 +122,8 @@ HWTEST_F(ExtensionRecordManagerTest, GetCallerTokenList_0100, TestSize.Level1)
std::list<sptr<IRemoteObject>> callerList;
extRecordMgr->GetCallerTokenList(abilityRecord, callerList);
ASSERT_NE(extRecordMgr, nullptr);
EXPECT_EQ(callerList.size(), 1);
EXPECT_EQ(callerList.front(), callerToken);
TAG_LOGI(AAFwkTag::TEST, "end.");
}

6
test/unittest/want_receiver_stub_test/BUILD.gn
View File

@ -17,12 +17,6 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
module_output_path = "ability_runtime/abilitymgr"
ohos_unittest("want_receiver_stub_test") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
blocklist = "../../cfi_blocklist.txt"
}
module_out_path = module_output_path
include_dirs = [

1
tools/test/unittest/aa/BUILD.gn
View File

@ -315,6 +315,7 @@ group("unittest") {
":aa_command_attach_test",
":aa_command_dump_test",
":aa_command_dumpsys_test",
":aa_command_force_stop_test",
":aa_command_start_test",
":aa_command_stop_service_test",
":aa_command_test",

5
tools/test/unittest/ability_delegator/BUILD.gn
View File

@ -204,6 +204,9 @@ group("unittest") {
":test_observer_test",
]
if (accessibility_enable) {
deps += [ ":shell_command_executor_test" ]
deps += [
":accessibility_ability_command_test",
":shell_command_executor_test",
]
}
}