diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn
index 785b5533e3..3f71a0d9dd 100644
--- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn
+++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn
@@ -86,10 +86,6 @@ ohos_unittest("context_deal_interface_test") {
 
 ohos_unittest("application_test") {
   module_out_path = module_output_path
-
-  include_dirs =
-      [ "//base/global/resource_management/frameworks/resmgr/include" ]
-
   sources = [
     "${ability_runtime_native_path}/appkit/app/app_context.cpp",
     "${ability_runtime_native_path}/appkit/app/app_loader.cpp",
@@ -202,13 +198,8 @@ ohos_unittest("application_impl_test") {
   sources = [
     "${ability_runtime_native_path}/appkit/app/app_context.cpp",
     "${ability_runtime_native_path}/appkit/app/app_loader.cpp",
-    "${ability_runtime_native_path}/appkit/app/application_env.cpp",
-    "${ability_runtime_native_path}/appkit/app/application_env_impl.cpp",
     "${ability_runtime_native_path}/appkit/app/application_impl.cpp",
     "${ability_runtime_native_path}/appkit/app/ohos_application.cpp",
-    "app_context_test.cpp",
-    "app_loader_test.cpp",
-    "application_env_impl_test.cpp",
     "application_impl_test.cpp",
   ]
 
@@ -334,79 +325,6 @@ ohos_unittest("mix_stack_dumper_test") {
   ]
 }
 
-ohos_unittest("ability_stage_test") {
-  module_out_path = module_output_path
-  sources = [
-    "${ability_runtime_native_path}/appkit/app/app_context.cpp",
-    "${ability_runtime_native_path}/appkit/app/app_loader.cpp",
-    "${ability_runtime_native_path}/appkit/app/ohos_application.cpp",
-    "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include/mock_bundle_manager.cpp",
-    "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include/sys_mgr_client_mock.cpp",
-    "ability_stage_test.cpp",
-    "application_data_manager_test.cpp",
-    "application_test.cpp",
-    "context_impl_test.cpp",
-  ]
-
-  configs = [ ":module_private_config" ]
-
-  deps = [
-    "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
-    "${ability_runtime_innerkits_path}/app_manager:app_manager",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
-    "${ability_runtime_native_path}/appkit:app_context",
-    "${ability_runtime_native_path}/appkit:appkit_native",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//third_party/googletest:gtest_main",
-  ]
-
-  external_deps = [
-    "ability_base:base",
-    "ability_base:configuration",
-    "ability_base:want",
-    "ability_runtime:runtime",
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "c_utils:utils",
-    "eventhandler:libeventhandler",
-    "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
-  ]
-}
-
-ohos_unittest("form_extension_context_test") {
-  module_out_path = module_output_path
-
-  sources = [
-    "${ability_runtime_native_path}/appkit/app/app_loader.cpp",
-    "${ability_runtime_native_path}/appkit/app/ohos_application.cpp",
-    "form_extension_context_test.cpp",
-  ]
-
-  configs = [ ":module_context_config" ]
-
-  deps = [
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
-    "${ability_runtime_native_path}/ability/native:form_extension",
-    "${ability_runtime_native_path}/appkit:app_context",
-    "${ability_runtime_native_path}/appkit:appkit_native",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
-
-  external_deps = [
-    "ability_base:configuration",
-    "ability_base:want",
-    "ability_runtime:runtime",
-    "bundle_framework:appexecfwk_base",
-    "c_utils:utils",
-    "form_fwk:fmskit_native",
-    "form_fwk:form_manager",
-    "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
-  ]
-}
-
 ###############################################################################
 
 group("unittest") {
@@ -414,13 +332,11 @@ group("unittest") {
   deps = []
 
   deps += [
-    ":ability_stage_test",
     ":ability_start_setting_test",
     ":application_impl_test",
     ":application_test",
     ":context_container_test",
     ":context_deal_test",
-    ":form_extension_context_test",
     ":mix_stack_dumper_test",
     ":watchdog_test",
   ]
diff --git a/test/unittest/frameworks_kits_appkit_native_test/context_container_test.cpp b/test/unittest/frameworks_kits_appkit_native_test/context_container_test.cpp
index b197d1eedb..4b711762fb 100644
--- a/test/unittest/frameworks_kits_appkit_native_test/context_container_test.cpp
+++ b/test/unittest/frameworks_kits_appkit_native_test/context_container_test.cpp
@@ -16,15 +16,15 @@
 #include <gtest/gtest.h>
 #include <singleton.h>
 #define private public
-#include "ohos_application.h"
-#include "system_ability_definition.h"
-#include "sys_mgr_client.h"
-#include "ability_context.h"
 #include "ability.h"
+#include "ability_context.h"
 #include "context_container.h"
 #include "context_deal.h"
-#include "mock_bundle_manager.h"
+#include "ohos_application.h"
 #undef private
+#include "system_ability_definition.h"
+#include "sys_mgr_client.h"
+#include "mock_bundle_manager.h"
 
 namespace OHOS {
 namespace AppExecFwk {
@@ -623,641 +623,755 @@ HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_InitResourceManager_0
 }
 
 /**
- * @tc.number: AttachBaseContext_0100
- * @tc.name: AttachBaseContext
- * @tc.desc: AttachBaseContext
+ * @tc.number: AppExecFwk_ContextContainer_DeleteFile_0100
+ * @tc.name: Delete File
+ * @tc.desc: Test Delete File When baseContext is not null,
+ *           and verify whether the return value of DeleteFile is correct.
  */
-HWTEST_F(ContextContainerTest, AttachBaseContext_0100, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->baseContext_, nullptr);
-}
-
-/**
- * @tc.number: GetResourceManager_0100
- * @tc.name: GetResourceManager
- * @tc.desc: GetResourceManager
- */
-HWTEST_F(ContextContainerTest, GetResourceManager_0100, Function | MediumTest | Level1)
-{
-    context_->baseContext_ = nullptr;
-    EXPECT_EQ(context_->GetResourceManager(), nullptr);
-}
-
-/**
- * @tc.number: DeleteFile_0100
- * @tc.name: DeleteFile
- * @tc.desc: DeleteFile
- */
-HWTEST_F(ContextContainerTest, DeleteFile_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_DeleteFile_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_TRUE(context_->DeleteFile("test_file"));
+
+    EXPECT_TRUE(context_->DeleteFile("test"));
 }
 
 /**
- * @tc.number: DeleteFile_0200
- * @tc.name: DeleteFile
- * @tc.desc: DeleteFile
+ * @tc.number: AppExecFwk_ContextContainer_DeleteFile_0200
+ * @tc.name: Delete File
+ * @tc.desc: Test Delete File When baseContext is null.
+ *           and verify whether the return value of DeleteFile is correct.
  */
-HWTEST_F(ContextContainerTest, DeleteFile_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_DeleteFile_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_FALSE(context_->DeleteFile("test_file"));
+    EXPECT_FALSE(context_->DeleteFile("test"));
 }
 
 /**
- * @tc.number: GetExternalCacheDir_0100
- * @tc.name: GetExternalCacheDir
- * @tc.desc: GetExternalCacheDir
+ * @tc.number: AppExecFwk_ContextContainer_GetExternalCacheDir_0100
+ * @tc.name: Get External Cache Dir
+ * @tc.desc: Test Get External Cache Dir When baseContext is not null,
+ *           and verify whether the return value of Get External Cache Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetExternalCacheDir_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetExternalCacheDir_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
+
     EXPECT_EQ(context_->GetExternalCacheDir(), "");
 }
 
 /**
- * @tc.number: GetExternalCacheDir_0200
- * @tc.name: GetExternalCacheDir
- * @tc.desc: GetExternalCacheDir
+ * @tc.number: AppExecFwk_ContextContainer_GetExternalCacheDir_0200
+ * @tc.name: Get External Cache Dir
+ * @tc.desc: Test Get External Cache Dir When baseContext is null.
+ *           and verify whether the return value of Get External Cache Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetExternalCacheDir_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetExternalCacheDir_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
     EXPECT_EQ(context_->GetExternalCacheDir(), "");
 }
 
 /**
- * @tc.number: GetExternalFilesDir_0100
- * @tc.name: GetExternalFilesDir
- * @tc.desc: GetExternalFilesDir
+ * @tc.number: AppExecFwk_ContextContainer_GetExternalFilesDir_0100
+ * @tc.name: Get External Files Dir
+ * @tc.desc: Test Get External Files Dir When baseContext is not null,
+ *           and verify whether the return value of Get External Files Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetExternalFilesDir_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetExternalFilesDir_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    string type = "type_test";
+
+    std::string type = "type";
     EXPECT_EQ(context_->GetExternalFilesDir(type), "");
 }
 
 /**
- * @tc.number: GetExternalFilesDir_0200
- * @tc.name: GetExternalFilesDir
- * @tc.desc: GetExternalFilesDir
+ * @tc.number: AppExecFwk_ContextContainer_GetExternalFilesDir_0200
+ * @tc.name: Get External FilesDir
+ * @tc.desc: Test Get External Files Dir When baseContext is null.
+ *           and verify whether the return value of Get External Files Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetExternalFilesDir_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetExternalFilesDir_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    string type = "type_test";
+    std::string type = "type";
     EXPECT_EQ(context_->GetExternalFilesDir(type), "");
 }
 
 /**
- * @tc.number: GetNoBackupFilesDir_0100
- * @tc.name: GetNoBackupFilesDir
- * @tc.desc: GetNoBackupFilesDir
+ * @tc.number: AppExecFwk_ContextContainer_GetNoBackupFilesDir_0100
+ * @tc.name: Get No Backup Files Dir
+ * @tc.desc: Test Get No Backup Files Dir When baseContext is not null,
+ *           and verify whether the return value of Get No Backup Files Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetNoBackupFilesDir_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetNoBackupFilesDir_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_NE(context_->GetNoBackupFilesDir(), "");
+
+    EXPECT_EQ(context_->GetNoBackupFilesDir(), "/data/storage/el2/base/data/no_backup");
 }
 
 /**
- * @tc.number: GetNoBackupFilesDir_0200
- * @tc.name: GetNoBackupFilesDir
- * @tc.desc: GetNoBackupFilesDir
+ * @tc.number: AppExecFwk_ContextContainer_GetNoBackupFilesDir_0200
+ * @tc.name: Get No Backup FilesDir
+ * @tc.desc: Test Get No Backup Files Dir When baseContext is null.
+ *           and verify whether the return value of Get No Backup Files Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetNoBackupFilesDir_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetNoBackupFilesDir_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
     EXPECT_EQ(context_->GetNoBackupFilesDir(), "");
 }
 
 /**
- * @tc.number: VerifySelfPermission_0100
- * @tc.name: VerifySelfPermission
- * @tc.desc: VerifySelfPermission
+ * @tc.number: AppExecFwk_ContextContainer_VerifySelfPermission_0100
+ * @tc.name: Verify Self Permission
+ * @tc.desc: Test Verify Self Permission When baseContext is not null,
+ *           and verify whether the return value of Verify Self Permission is correct.
  */
-HWTEST_F(ContextContainerTest, VerifySelfPermission_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_VerifySelfPermission_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    std::string permission = "test_permission";
-    EXPECT_NE(context_->VerifySelfPermission(permission), AppExecFwk::Constants::PERMISSION_NOT_GRANTED);
+
+    EXPECT_EQ(context_->VerifySelfPermission("permission"), AppExecFwk::Constants::PERMISSION_GRANTED);
 }
 
 /**
- * @tc.number: VerifySelfPermission_0200
- * @tc.name: VerifySelfPermission
- * @tc.desc: VerifySelfPermission
+ * @tc.number: AppExecFwk_ContextContainer_VerifySelfPermission_0200
+ * @tc.name: Verify Self Permission
+ * @tc.desc: Test Verify Self Permission When baseContext is null.
+ *           and verify whether the return value of Verify Self Permission is correct.
  */
-HWTEST_F(ContextContainerTest, VerifySelfPermission_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_VerifySelfPermission_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    std::string permission = "test_permission";
-    EXPECT_EQ(context_->VerifySelfPermission(permission), AppExecFwk::Constants::PERMISSION_NOT_GRANTED);
+    EXPECT_EQ(context_->VerifySelfPermission("permission"), AppExecFwk::Constants::PERMISSION_NOT_GRANTED);
 }
 
 /**
- * @tc.number: UnauthUriPermission_0100
- * @tc.name: UnauthUriPermission
- * @tc.desc: UnauthUriPermission
+ * @tc.number: AppExecFwk_ContextContainer_UnauthUriPermission_0100
+ * @tc.name: Unauth Uri Permission
+ * @tc.desc: Test Unauth Uri Permission When baseContext is not null
  */
-HWTEST_F(ContextContainerTest, UnauthUriPermission_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_UnauthUriPermission_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    std::string permission = "test_permission";
-    Uri uri("");
-    int uid = 0;
-    context_->UnauthUriPermission(permission, uri, uid);
+
+    Uri urivalue("");
+    context_->UnauthUriPermission("permission", urivalue, 0);
 }
 
 /**
- * @tc.number: UnauthUriPermission_0200
- * @tc.name: UnauthUriPermission
- * @tc.desc: UnauthUriPermission
+ * @tc.number: AppExecFwk_ContextContainer_UnauthUriPermission_0200
+ * @tc.name: Unauth Uri Permission
+ * @tc.desc: TestUnauth Uri Permission When baseContext is null.
  */
-HWTEST_F(ContextContainerTest, UnauthUriPermission_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_UnauthUriPermission_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    std::string permission = "test_permission";
-    Uri uri("");
-    int uid = 0;
-    context_->UnauthUriPermission(permission, uri, uid);
+    Uri urivalue("");
+    context_->UnauthUriPermission("permission", urivalue, 0);
 }
 
 /**
- * @tc.number: VerifyPermission_0100
- * @tc.name: VerifyPermission
- * @tc.desc: VerifyPermission
+ * @tc.number: AppExecFwk_ContextContainer_GetDistributedDir_0100
+ * @tc.name: Get Distributed Dir
+ * @tc.desc: Test Get Distributed Dir When baseContext is not null,
+ *           and verify whether the return value of Get Distributed Dir is correct.
  */
-HWTEST_F(ContextContainerTest, VerifyPermission_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetDistributedDir_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    std::string permission = "test_permission";
-    int pid = 0;
-    int uid = 0;
-    EXPECT_EQ(context_->VerifyPermission(permission, pid, uid), AppExecFwk::Constants::PERMISSION_NOT_GRANTED);
+
+    EXPECT_EQ(context_->GetDistributedDir(), "/data/storage/el2/distributedfiles");
 }
 
 /**
- * @tc.number: VerifyPermission_0200
- * @tc.name: VerifyPermission
- * @tc.desc: VerifyPermission
+ * @tc.number: AppExecFwk_ContextContainer_GetDistributedDir_0200
+ * @tc.name: Get Distributed Dir
+ * @tc.desc: Test Get Distributed Dir When baseContext is null.
+ *           and verify whether the return value of Get Distributed Dir is correct.
  */
-HWTEST_F(ContextContainerTest, VerifyPermission_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetDistributedDir_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    std::string permission = "test_permission";
-    int pid = 0;
-    int uid = 0;
-    EXPECT_EQ(context_->VerifyPermission(permission, pid, uid), AppExecFwk::Constants::PERMISSION_NOT_GRANTED);
-}
-
-/**
- * @tc.number: GetDistributedDir_0100
- * @tc.name: GetDistributedDir
- * @tc.desc: GetDistributedDir
- */
-HWTEST_F(ContextContainerTest, GetDistributedDir_0100, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(contextDeal_);
-    EXPECT_NE(context_->GetDistributedDir(), "");
-}
-
-/**
- * @tc.number: GetDistributedDir_0200
- * @tc.name: GetDistributedDir
- * @tc.desc: GetDistributedDir
- */
-HWTEST_F(ContextContainerTest, GetDistributedDir_0200, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(nullptr);
     EXPECT_EQ(context_->GetDistributedDir(), "");
 }
 
 /**
- * @tc.number: SetPattern_0100
- * @tc.name: SetPattern
- * @tc.desc: SetPattern
+ * @tc.number: AppExecFwk_ContextContainer_GetAbilityPackageContext_0100
+ * @tc.name: Get Ability Package Context
+ * @tc.desc: Test Get Ability Package Context When baseContext is not null,
+ *           and verify whether the return value of Get Ability Package Context is correct.
  */
-HWTEST_F(ContextContainerTest, SetPattern_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetAbilityPackageContext_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    int patternId = 0;
-    context_->SetPattern(patternId);
-}
 
-/**
- * @tc.number: SetPattern_0200
- * @tc.name: SetPattern
- * @tc.desc: SetPattern
- */
-HWTEST_F(ContextContainerTest, SetPattern_0200, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(nullptr);
-    int patternId = 0;
-    context_->SetPattern(patternId);
-}
-
-/**
- * @tc.number: GetAbilityPackageContext_0100
- * @tc.name: GetAbilityPackageContext
- * @tc.desc: GetAbilityPackageContext
- */
-HWTEST_F(ContextContainerTest, GetAbilityPackageContext_0100, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(contextDeal_);
     EXPECT_EQ(context_->GetAbilityPackageContext(), nullptr);
 }
 
 /**
- * @tc.number: GetAbilityPackageContext_0200
- * @tc.name: GetAbilityPackageContext
- * @tc.desc: GetAbilityPackageContext
+ * @tc.number: AppExecFwk_ContextContainer_GetAbilityPackageContext_0200
+ * @tc.name: Get Ability Package Context
+ * @tc.desc: Test Get Ability Package Context When baseContext is null.
+ *           and verify whether the return value of Get Ability Package Context is correct.
  */
-HWTEST_F(ContextContainerTest, GetAbilityPackageContext_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetAbilityPackageContext_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
     EXPECT_EQ(context_->GetAbilityPackageContext(), nullptr);
 }
 
 /**
- * @tc.number: RequestPermissionsFromUser_0100
- * @tc.name: RequestPermissionsFromUser
- * @tc.desc: RequestPermissionsFromUser
+ * @tc.number: AppExecFwk_ContextContainer_GetHapModuleInfo_0100
+ * @tc.name: Get Hap Module Info
+ * @tc.desc: Test Get Hap Module Info When baseContext is not null,
+ *           and verify whether the return value of Get Hap Module Info is correct.
  */
-HWTEST_F(ContextContainerTest, RequestPermissionsFromUser_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetHapModuleInfo_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+    contextDeal_->hapModuleInfoLocal_ = std::make_shared<HapModuleInfo>();
     context_->AttachBaseContext(contextDeal_);
-    std::vector<std::string> permissions;
-    std::vector<int> permissionsState;
-    PermissionRequestTask task;
-    context_->RequestPermissionsFromUser(permissions, permissionsState, std::move(task));
+
+    EXPECT_NE(context_->GetHapModuleInfo(), nullptr);
 }
 
 /**
- * @tc.number: RequestPermissionsFromUser_0200
- * @tc.name: RequestPermissionsFromUser
- * @tc.desc: RequestPermissionsFromUser
+ * @tc.number: AppExecFwk_ContextContainer_GetHapModuleInfo_0200
+ * @tc.name: Get Hap Module Info
+ * @tc.desc: Test Get Hap Module Info When baseContext is null.
+ *           and verify whether the return value of Get Hap Module Info is correct.
  */
-HWTEST_F(ContextContainerTest, RequestPermissionsFromUser_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetHapModuleInfo_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    std::vector<std::string> permissions;
-    std::vector<int> permissionsState;
-    PermissionRequestTask task;
-    context_->RequestPermissionsFromUser(permissions, permissionsState, std::move(task));
+    EXPECT_EQ(context_->GetHapModuleInfo(), nullptr);
 }
 
 /**
- * @tc.number: CreateBundleContext_0100
- * @tc.name: CreateBundleContext
- * @tc.desc: CreateBundleContext
+ * @tc.number: AppExecFwk_ContextContainer_GetCaller_0100
+ * @tc.name: Get Caller
+ * @tc.desc: Test Get Caller When baseContext is not null,
+ *           and verify whether the return value of Get Caller is correct.
  */
-HWTEST_F(ContextContainerTest, CreateBundleContext_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetCaller_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+    contextDeal_->SerUriString("test");
     context_->AttachBaseContext(contextDeal_);
-    std::string bundleName = "test_bundle";
-    int flag = 0;
-    int accountId = 0;
-    EXPECT_EQ(context_->CreateBundleContext(bundleName, flag, accountId), nullptr);
+
+    Uri uri("test");
+    EXPECT_EQ(context_->GetCaller(), uri);
 }
 
 /**
- * @tc.number: CreateBundleContext_0200
- * @tc.name: CreateBundleContext
- * @tc.desc: CreateBundleContext
+ * @tc.number: AppExecFwk_ContextContainer_GetCaller_0200
+ * @tc.name: Request Permissions From User
+ * @tc.desc: Test Get Caller When baseContext is null.
+ *           and verify whether the return value of Get Caller is correct.
  */
-HWTEST_F(ContextContainerTest, CreateBundleContext_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetCaller_0200, Function | MediumTest | Level3)
 {
+    Uri uri("");
+    EXPECT_EQ(context_->GetCaller(), uri);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_GetString_0100
+ * @tc.name: Get String
+ * @tc.desc: Test Get String When baseContext is not null,
+ *           and verify whether the return value of Get String is correct.
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetString_0100, Function | MediumTest | Level1)
+{
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    std::string bundleName = "";
-    int flag = 0;
-    int accountId = 0;
-    EXPECT_EQ(context_->CreateBundleContext(bundleName, flag, accountId), nullptr);
+
+    EXPECT_EQ(context_->GetString(0), "");
 }
 
 /**
- * @tc.number: CreateBundleContext_0300
- * @tc.name: CreateBundleContext
- * @tc.desc: CreateBundleContext
+ * @tc.number: AppExecFwk_ContextContainer_GetString_0200
+ * @tc.name: Get String
+ * @tc.desc: Test Get String When baseContext is null.
+ *           and verify whether the return value of Get String is correct.
  */
-HWTEST_F(ContextContainerTest, CreateBundleContext_0300, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetString_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    std::string bundleName = "test_bundle";
-    int flag = 0;
-    int accountId = 0;
-    EXPECT_EQ(context_->CreateBundleContext(bundleName, flag, accountId), nullptr);
+    EXPECT_EQ(context_->GetString(0), "");
 }
 
 /**
- * @tc.number: GetString_0100
- * @tc.name: GetString
- * @tc.desc: GetString
+ * @tc.number: AppExecFwk_ContextContainer_GetStringArray_0100
+ * @tc.name: Get String Array
+ * @tc.desc: Test Get String Array When baseContext is not null,
+ *           and verify whether the return value of Get String Array is correct.
  */
-HWTEST_F(ContextContainerTest, GetString_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetStringArray_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_EQ(context_->GetString(1), "");
+
+    std::vector<std::string> ret = context_->GetStringArray(0);
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetString_0200
- * @tc.name: GetString
- * @tc.desc: GetString
+ * @tc.number: AppExecFwk_ContextContainer_GetStringArray_0200
+ * @tc.name: Get String Array
+ * @tc.desc: Test Get String Array When baseContext is null.
+ *           and verify whether the return value of Get String Array is correct.
  */
-HWTEST_F(ContextContainerTest, GetString_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetStringArray_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetString(1), "");
+    std::vector<std::string> ret = context_->GetStringArray(0);
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetStringArray_0100
- * @tc.name: GetStringArray
- * @tc.desc: GetStringArray
+ * @tc.number: AppExecFwk_ContextContainer_GetIntArray_0100
+ * @tc.name: Get Int Array
+ * @tc.desc: Test Get Int Array When baseContext is not null,
+ *           and verify whether the return value of Get Int Array is correct.
  */
-HWTEST_F(ContextContainerTest, GetStringArray_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetIntArray_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_EQ(context_->GetStringArray(1).size(), 0);
+
+    std::vector<int> ret = context_->GetIntArray(0);
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetStringArray_0200
- * @tc.name: GetStringArray
- * @tc.desc: GetStringArray
+ * @tc.number: AppExecFwk_ContextContainer_GetIntArray_0200
+ * @tc.name: Get Int Array
+ * @tc.desc: Test Get Int Array When baseContext is null.
+ *           and verify whether the return value of Get Int Array is correct.
  */
-HWTEST_F(ContextContainerTest, GetStringArray_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetIntArray_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetStringArray(1).size(), 0);
+    std::vector<int> ret = context_->GetIntArray(0);
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetIntArray_0100
- * @tc.name: GetIntArray
- * @tc.desc: GetIntArray
+ * @tc.number: AppExecFwk_ContextContainer_GetTheme_0100
+ * @tc.name: Get Theme
+ * @tc.desc: Test Get Theme When baseContext is not null,
+ *           and verify whether the return value of Get Theme is correct.
  */
-HWTEST_F(ContextContainerTest, GetIntArray_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetTheme_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_EQ(context_->GetIntArray(1).size(), 0);
+    std::map<std::string, std::string> ret = context_->GetTheme();
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetIntArray_0200
- * @tc.name: GetIntArray
- * @tc.desc: GetIntArray
+ * @tc.number: AppExecFwk_ContextContainer_GetTheme_0200
+ * @tc.name: Get Theme
+ * @tc.desc: Test Get Theme When baseContext is null.
+ *           and verify whether the return value of Get Theme is correct.
  */
-HWTEST_F(ContextContainerTest, GetIntArray_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetTheme_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetIntArray(1).size(), 0);
+    std::map<std::string, std::string> ret = context_->GetTheme();
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetTheme_0100
- * @tc.name: GetTheme
- * @tc.desc: GetTheme
+ * @tc.number: AppExecFwk_ContextContainer_SetTheme_0100
+ * @tc.name: Set Theme
+ * @tc.desc: Test Set Theme When baseContext is not null,
  */
-HWTEST_F(ContextContainerTest, GetTheme_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_SetTheme_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_EQ(context_->GetTheme().size(), 0);
+    context_->SetTheme(0);
 }
 
 /**
- * @tc.number: GetTheme_0200
- * @tc.name: GetTheme
- * @tc.desc: GetTheme
+ * @tc.number: AppExecFwk_ContextContainer_SetTheme_0200
+ * @tc.name: Set Theme
+ * @tc.desc: Test Set Theme When baseContext is null.
  */
-HWTEST_F(ContextContainerTest, GetTheme_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_SetTheme_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetTheme().size(), 0);
+    context_->SetTheme(0);
 }
 
 /**
- * @tc.number: SetTheme_0100
- * @tc.name: SetTheme
- * @tc.desc: SetTheme
+ * @tc.number: AppExecFwk_ContextContainerGetPattern_0100
+ * @tc.name: Get Pattern
+ * @tc.desc: Test Get Pattern When baseContext is not null,
+ *           and verify whether the return value of Get Pattern is correct.
  */
-HWTEST_F(ContextContainerTest, SetTheme_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetPattern_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    context_->SetTheme(1);
+
+    std::map<std::string, std::string> ret = context_->GetPattern();
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: SetTheme_0200
- * @tc.name: SetTheme
- * @tc.desc: SetTheme
+ * @tc.number: AppExecFwk_ContextContainer_GetPattern_0200
+ * @tc.name: Get Pattern
+ * @tc.desc: Test Get Pattern When baseContext is null.
+ *           and verify whether the return value of Get Pattern is correct.
  */
-HWTEST_F(ContextContainerTest, SetTheme_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetPattern_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    context_->SetTheme(1);
+    std::map<std::string, std::string> ret = context_->GetPattern();
+    EXPECT_EQ(ret.size(), 0);
 }
 
 /**
- * @tc.number: GetPattern_0100
- * @tc.name: GetPattern
- * @tc.desc: GetPattern
+ * @tc.number: AppExecFwk_ContextContainerSetPattern_0100
+ * @tc.name: Set Pattern
+ * @tc.desc: Test Get Pattern When baseContext is not null,
  */
-HWTEST_F(ContextContainerTest, GetPattern_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_SetPattern_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_EQ(context_->GetPattern().size(), 0);
+
+    context_->SetPattern(0);
 }
 
 /**
- * @tc.number: GetPattern_0200
- * @tc.name: GetPattern
- * @tc.desc: GetPattern
+ * @tc.number: AppExecFwk_ContextContainer_SetPattern_0200
+ * @tc.name: Set Pattern
+ * @tc.desc: Test Set Pattern When baseContext is null.
  */
-HWTEST_F(ContextContainerTest, GetPattern_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_SetPattern_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetPattern().size(), 0);
+    context_->SetPattern(0);
 }
 
 /**
- * @tc.number: GetColor_0100
- * @tc.name: GetColor
- * @tc.desc: GetColor
+ * @tc.number: AppExecFwk_ContextContainer_GetColor_0100
+ * @tc.name: Get Color
+ * @tc.desc: Test Get Color When baseContext is not null,
+ *           and verify whether the return value of Get Color is correct.
  */
-HWTEST_F(ContextContainerTest, GetColor_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetColor_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_EQ(context_->GetColor(1), -1);
+
+    EXPECT_EQ(context_->GetColor(0), -1);
 }
 
 /**
- * @tc.number: GetThemeId_0100
- * @tc.name: GetThemeId
- * @tc.desc: GetThemeId
+ * @tc.number: AppExecFwk_ContextContainer_GetColor_0200
+ * @tc.name: Get Color
+ * @tc.desc: Test Get Color When baseContext is null.
+ *           and verify whether the return value of Get Color is correct.
  */
-HWTEST_F(ContextContainerTest, GetThemeId_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetColor_0200, Function | MediumTest | Level3)
 {
+    EXPECT_EQ(context_->GetColor(0), -1);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_GetThemeId_0100
+ * @tc.name: Get Theme Id
+ * @tc.desc: Test Get Theme Id When baseContext is not null,
+ *           and verify whether the return value of Get Theme Id is correct.
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetThemeId_0100, Function | MediumTest | Level1)
+{
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
+
     EXPECT_EQ(context_->GetThemeId(), -1);
 }
 
 /**
- * @tc.number: GetDisplayOrientation_0100
- * @tc.name: GetDisplayOrientation
- * @tc.desc: GetDisplayOrientation
+ * @tc.number: AppExecFwk_ContextContainer_GetThemeId_0200
+ * @tc.name: Get Theme Id
+ * @tc.desc: Test Get Theme Id When baseContext is null.
+ *           and verify whether the return value of Get Theme Id is correct.
  */
-HWTEST_F(ContextContainerTest, GetDisplayOrientation_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetThemeId_0200, Function | MediumTest | Level3)
 {
+    EXPECT_EQ(context_->GetThemeId(), -1);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_GetDisplayOrientation_0100
+ * @tc.name: Get Display Orientation
+ * @tc.desc: Test Get Display Orientation When baseContext is not null,
+ *           and verify whether the return value of Get Display Orientation is correct.
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetDisplayOrientation_0100, Function | MediumTest | Level1)
+{
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+    contextDeal_-> abilityInfo_ = std::make_shared<AbilityInfo>();
+    contextDeal_->abilityInfo_->orientation = DisplayOrientation::LANDSCAPE;
     context_->AttachBaseContext(contextDeal_);
+
+    EXPECT_EQ(context_->GetDisplayOrientation(), 1);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_GetDisplayOrientation_0200
+ * @tc.name: Get Display Orientation
+ * @tc.desc: Test Get Display Orientation When baseContext is null.
+ *           and verify whether the return value of Get Display Orientation is correct.
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetDisplayOrientation_0200, Function | MediumTest | Level3)
+{
     EXPECT_EQ(context_->GetDisplayOrientation(), 0);
 }
 
 /**
- * @tc.number: GetDisplayOrientation_0200
- * @tc.name: GetDisplayOrientation
- * @tc.desc: GetDisplayOrientation
+ * @tc.number: AppExecFwk_ContextContainer_GetPreferencesDir_0100
+ * @tc.name: Get Preferences Dir
+ * @tc.desc: Test Get Preferences Dir When baseContext is not null,
+ *           and verify whether the return value of Get Preferences Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetDisplayOrientation_0200, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetDisplayOrientation(), 0);
-}
-
-/**
- * @tc.number: GetPreferencesDir_0100
- * @tc.name: GetPreferencesDir
- * @tc.desc: GetPreferencesDir
- */
-HWTEST_F(ContextContainerTest, GetPreferencesDir_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetPreferencesDire_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_NE(context_->GetPreferencesDir(), "");
+
+    EXPECT_EQ(context_->GetPreferencesDir(), "/data/storage/el2/base/preferences");
 }
 
 /**
- * @tc.number: GetPreferencesDir_0200
- * @tc.name: GetPreferencesDir
- * @tc.desc: GetPreferencesDir
+ * @tc.number: AppExecFwk_ContextContainer_GetPreferencesDir_0200
+ * @tc.name: Get Preferences Dir
+ * @tc.desc: Test Get Preferences Dir When baseContext is null.
+ *           and verify whether the return value of Get Preferences Dir is correct.
  */
-HWTEST_F(ContextContainerTest, GetPreferencesDir_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetPreferencesDir_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
     EXPECT_EQ(context_->GetPreferencesDir(), "");
 }
 
 /**
- * @tc.number: SetColorMode_0100
- * @tc.name: SetColorMode
- * @tc.desc: SetColorMode
+ * @tc.number: AppExecFwk_ContextContainer_GetColorMode_0100
+ * @tc.name: Get Color Mode
+ * @tc.desc: Test Get Color Mode When baseContext is not null,
+ *           and verify whether the return value of Get Color Mode is correct.
  */
-HWTEST_F(ContextContainerTest, SetColorMode_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetColorMode_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+    contextDeal_->hapModuleInfoLocal_ = std::make_shared<HapModuleInfo>();
     context_->AttachBaseContext(contextDeal_);
-    context_->SetColorMode(1);
+
+    context_->SetColorMode(static_cast<int>(ModuleColorMode::DARK));
+    EXPECT_EQ(context_->GetColorMode(), static_cast<int>(ModuleColorMode::DARK));
 }
 
 /**
- * @tc.number: SetColorMode_0200
- * @tc.name: SetColorMode
- * @tc.desc: SetColorMode
+ * @tc.number: AppExecFwk_ContextContainer_GetColorMode_0200
+ * @tc.name: Get Color Mode
+ * @tc.desc: Test Get Color Mode When baseContext is null.
+ *           and verify whether the return value of Get Color Mode is correct.
  */
-HWTEST_F(ContextContainerTest, SetColorMode_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetColorMode_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    context_->SetColorMode(1);
-}
-
-/**
- * @tc.number: GetColorMode_0100
- * @tc.name: GetColorMode
- * @tc.desc: GetColorMode
- */
-HWTEST_F(ContextContainerTest, GetColorMode_0100, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(contextDeal_);
+    context_->SetColorMode(-1);
     EXPECT_EQ(context_->GetColorMode(), -1);
 }
 
 /**
- * @tc.number: GetColorMode_0200
- * @tc.name: GetColorMode
- * @tc.desc: GetColorMode
+ * @tc.number: AppExecFwk_ContextContainer_GetMissionId_0100
+ * @tc.name: Get Mission Id
+ * @tc.desc: Test Get Mission Id When baseContext is not null,
+ *           and verify whether the return value of Get Mission Id is correct.
  */
-HWTEST_F(ContextContainerTest, GetColorMode_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetMissionId_0100, Function | MediumTest | Level1)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetColorMode(), -1);
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+
+    AAFwk::LifeCycleStateInfo lifeCycleStateInfo;
+    lifeCycleStateInfo.missionId = 0;
+    contextDeal_->SetLifeCycleStateInfo(lifeCycleStateInfo);
+    context_->AttachBaseContext(contextDeal_);
+
+    EXPECT_EQ(context_->GetMissionId(), 0);
 }
 
 /**
- * @tc.number: GetMissionId_0100
- * @tc.name: GetMissionId
- * @tc.desc: GetMissionId
+ * @tc.number: AppExecFwk_ContextContainer_GetMissionId_0200
+ * @tc.name: Get Mission Id
+ * @tc.desc: Test Get Mission Id When baseContext is null.
+ *           and verify whether the return value of Get Mission Id is correct.
  */
-HWTEST_F(ContextContainerTest, GetMissionId_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_GetMissionId_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(contextDeal_);
     EXPECT_EQ(context_->GetMissionId(), -1);
 }
 
 /**
- * @tc.number: GetMissionId_0200
- * @tc.name: GetMissionId
- * @tc.desc: GetMissionId
+ * @tc.number: AppExecFwk_ContextContainer_IsUpdatingConfigurations_0100
+ * @tc.name: Is Updating Configurations
+ * @tc.desc: Test Is Updating Configurations When baseContext is not null,
+ *           and verify whether the return value of Is Updating Configurations is correct.
  */
-HWTEST_F(ContextContainerTest, GetMissionId_0200, Function | MediumTest | Level1)
-{
-    context_->AttachBaseContext(nullptr);
-    EXPECT_EQ(context_->GetMissionId(), -1);
-}
-
-/**
- * @tc.number: IsUpdatingConfigurations_0100
- * @tc.name: IsUpdatingConfigurations
- * @tc.desc: IsUpdatingConfigurations
- */
-HWTEST_F(ContextContainerTest, IsUpdatingConfigurations_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_IsUpdatingConfigurations_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_FALSE(context_->IsUpdatingConfigurations());
+
+    EXPECT_EQ(context_->IsUpdatingConfigurations(), false);
 }
 
 /**
- * @tc.number: IsUpdatingConfigurations_0200
- * @tc.name: IsUpdatingConfigurations
- * @tc.desc: IsUpdatingConfigurations
+ * @tc.number: AppExecFwk_ContextContainer_IsUpdatingConfigurations_0200
+ * @tc.name: Is Updating Configurations
+ * @tc.desc: Test Is Updating Configurations When baseContext is null.
+ *           and verify whether the return value of Is Updating Configurations is correct.
  */
-HWTEST_F(ContextContainerTest, IsUpdatingConfigurations_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_IsUpdatingConfigurations_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_FALSE(context_->IsUpdatingConfigurations());
+    EXPECT_EQ(context_->IsUpdatingConfigurations(), false);
 }
 
 /**
- * @tc.number: PrintDrawnCompleted_0100
- * @tc.name: PrintDrawnCompleted
- * @tc.desc: PrintDrawnCompleted
+ * @tc.number: AppExecFwk_ContextContainer_PrintDrawnCompleted_0100
+ * @tc.name: Print Drawn Completed
+ * @tc.desc: Test Print Drawn Completed When baseContext is not null,
+ *           and verify whether the return value of Print Drawn Completed is correct.
  */
-HWTEST_F(ContextContainerTest, PrintDrawnCompleted_0100, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_PrintDrawnCompleted_0100, Function | MediumTest | Level1)
 {
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
     context_->AttachBaseContext(contextDeal_);
-    EXPECT_FALSE(context_->PrintDrawnCompleted());
+
+    EXPECT_EQ(context_->PrintDrawnCompleted(), false);
 }
 
 /**
- * @tc.number: PrintDrawnCompleted_0200
- * @tc.name: PrintDrawnCompleted
- * @tc.desc: PrintDrawnCompleted
+ * @tc.number: AppExecFwk_ContextContainer_PrintDrawnCompleted_0200
+ * @tc.name: Print Drawn Completed
+ * @tc.desc: Test Print Drawn Completed When baseContext is null.
+ *           and verify whether the return value of Print Drawn Completed is correct.
  */
-HWTEST_F(ContextContainerTest, PrintDrawnCompleted_0200, Function | MediumTest | Level1)
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_PrintDrawnCompleted_0200, Function | MediumTest | Level3)
 {
-    context_->AttachBaseContext(nullptr);
-    EXPECT_FALSE(context_->PrintDrawnCompleted());
+    EXPECT_EQ(context_->PrintDrawnCompleted(), false);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_CreateBundleContext_0100
+* @tc.name: Create Bundle Context
+ * @tc.desc: Test Create Bundle Context return is not null.
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_CreateBundleContext_0100, Function | MediumTest | Level1)
+{
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    std::shared_ptr<ApplicationInfo> info = std::make_shared<ApplicationInfo>();
+    std::string bundleName = "BundleName";
+    info->bundleName = bundleName;
+    contextDeal_->SetContext(context);
+    contextDeal_->SetApplicationInfo(info);
+    contextDeal_->SetApplicationContext(context);
+    context_->AttachBaseContext(contextDeal_);
+
+    EXPECT_NE(context_->CreateBundleContext("BundleName", 0, 0), nullptr);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_CreateBundleContext_0200
+ * @tc.name: Create Bundle Context
+ * @tc.desc: Test Create Bundle Context return is null because bundle info is error account id is not DEFAULT_ACCOUNT_ID
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_CreateBundleContext_0200, Function | MediumTest | Level3)
+{
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+    context_->AttachBaseContext(contextDeal_);
+
+    EXPECT_EQ(context_->CreateBundleContext("bundlename", 0, 0), nullptr);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_CreateBundleContext_0300
+ * @tc.name: Create Bundle Context
+ * @tc.desc: Test Create Bundle Context return is null because bundle info is error account id is DEFAULT_ACCOUNT_ID
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_CreateBundleContext_0300, Function | MediumTest | Level3)
+{
+    std::shared_ptr<Ability> ability = std::make_shared<Ability>();
+    std::shared_ptr<Context> context(ability);
+    contextDeal_->SetContext(context);
+    context_->AttachBaseContext(contextDeal_);
+
+    EXPECT_EQ(context_->CreateBundleContext("bundlename", 0, DEFAULT_ACCOUNT_ID), nullptr);
+}
+
+/**
+ * @tc.number: AppExecFwk_ContextContainer_CreateBundleContext_0400
+ * @tc.name: Create Bundle Context
+ * @tc.desc: Test Create Bundle Context return is null because bundle name is empty
+ */
+HWTEST_F(ContextContainerTest, AppExecFwk_ContextContainer_CreateBundleContext_0400, Function | MediumTest | Level3)
+{
+    EXPECT_EQ(context_->CreateBundleContext("", 0, 0), nullptr);
 }
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/tools/BUILD.gn b/tools/BUILD.gn
index 9c45a2a538..4dbd186435 100644
--- a/tools/BUILD.gn
+++ b/tools/BUILD.gn
@@ -16,4 +16,8 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 group("tools_target") {
   deps = [ "aa:tools_aa" ]
+
+  if (ability_runtime_graphics) {
+    deps += [ "fm:tools_fm" ]
+  }
 }
diff --git a/tools/test/unittest/ability_delegator/test_observer_test.cpp b/tools/test/unittest/ability_delegator/test_observer_test.cpp
index 813e22cb25..16c69930f4 100644
--- a/tools/test/unittest/ability_delegator/test_observer_test.cpp
+++ b/tools/test/unittest/ability_delegator/test_observer_test.cpp
@@ -110,3 +110,30 @@ HWTEST_F(TestObserverTest, Test_Observer_Test_0300, Function | MediumTest | Leve
     th.join();
     EXPECT_TRUE(ret);
 }
+
+/**
+ * @tc.number: Test_Observer_Test_0400
+ * @tc.name: WaitForFinish
+ * @tc.desc: Verify the WaitForFinish return false.
+ */
+HWTEST_F(TestObserverTest, Test_Observer_Test_0400, Function | MediumTest | Level1)
+{
+    HILOG_INFO("Test_Observer_Test_0400 is called");
+    TestObserver observer;
+    observer.isFinished_ = false;
+    bool ret = observer.WaitForFinish(1);
+    EXPECT_FALSE(ret);
+}
+
+/**
+ * @tc.number: Test_Observer_Test_0500
+ * @tc.name: WaitForFinish
+ * @tc.desc: Verify the TestStatus.
+ */
+HWTEST_F(TestObserverTest, Test_Observer_Test_0500, Function | MediumTest | Level1)
+{
+    HILOG_INFO("Test_Observer_Test_0500 is called");
+    TestObserver observer;
+    observer.isFinished_ = false;
+    observer.TestStatus(MSG.c_str(), RESULT_CODE);
+}
diff --git a/tools/test/unittest/system_time/BUILD.gn b/tools/test/unittest/system_time/BUILD.gn
new file mode 100644
index 0000000000..65da0871fd
--- /dev/null
+++ b/tools/test/unittest/system_time/BUILD.gn
@@ -0,0 +1,39 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/test.gni")
+import("//foundation/ability/ability_runtime/ability_runtime.gni")
+
+module_output_path = "ability_tools/tools"
+
+ohos_unittest("system_time_test") {
+  module_out_path = module_output_path
+
+  sources = [ "system_time_test.cpp" ]
+
+  cflags = []
+  if (target_cpu == "arm") {
+    cflags += [ "-DBINDER_IPC_32BIT" ]
+  }
+
+  deps = [
+    "${ability_runtime_path}/tools/aa:tools_aa_source_set",
+    "//third_party/googletest:gtest_main",
+  ]
+}
+
+group("unittest") {
+  testonly = true
+
+  deps = [ ":system_time_test" ]
+}
diff --git a/tools/test/unittest/system_time/system_time_test.cpp b/tools/test/unittest/system_time/system_time_test.cpp
new file mode 100644
index 0000000000..5f43821971
--- /dev/null
+++ b/tools/test/unittest/system_time/system_time_test.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include "system_time.h"
+
+using namespace testing::ext;
+using namespace OHOS;
+using namespace OHOS::AAFwk;
+
+namespace OHOS {
+namespace AAFwk {
+namespace {
+} // namespace
+
+class SystemTimeTest : public testing::Test {
+public:
+    static void SetUpTestCase();
+    static void TearDownTestCase();
+    void SetUp();
+    void TearDown();
+};
+
+void SystemTimeTest::SetUpTestCase()
+{}
+
+void SystemTimeTest::TearDownTestCase()
+{}
+
+void SystemTimeTest::SetUp()
+{}
+
+void SystemTimeTest::TearDown()
+{}
+
+/**
+ * @tc.name: System_Time_Get_Now_System_0100
+ * @tc.desc: "Get System Time" test.
+ * @tc.type: FUNC
+ */
+HWTEST_F(SystemTimeTest, System_Time_Get_Now_System_0100, TestSize.Level1)
+{
+    SystemTime systemTime;
+    EXPECT_GT(systemTime.GetNowSysTime(), 0);
+}
+} // namespace AAFwk
+} // namespace OHOS