diff --git a/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp b/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp
index 07096633dbe937efeaa809e3928b556d25030d2e..5a1e7b03fa93239338d302cdfda77d00f02432c6 100755
--- a/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp
+++ b/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp
@@ -39,7 +39,7 @@ napi_value ContextConstructor(napi_env env, napi_callback_info info)
 bool UnwrapParamVerifySelfPermission(
     napi_env env, size_t argc, napi_value *argv, AsyncJSCallbackInfo *asyncCallbackInfo)
 {
-    HILOG_INFO("%{public}s called, argc=%{public}d", __func__, argc);
+    HILOG_INFO("%{public}s called, argc=%{public}zu", __func__, argc);
 
     const size_t argcMax = 2;
     if (argc > argcMax || argc < argcMax - 1) {
@@ -159,7 +159,7 @@ napi_value NAPI_VerifySelfPermission(napi_env env, napi_callback_info info)
 bool UnwrapRequestPermissionsFromUser(
     napi_env env, size_t argc, napi_value *argv, AsyncJSCallbackInfo *asyncCallbackInfo)
 {
-    HILOG_INFO("%{public}s called, argc=%{public}d", __func__, argc);
+    HILOG_INFO("%{public}s called, argc=%{public}zu", __func__, argc);
 
     const size_t argcMax = 3;
     if (argc > argcMax || argc < argcMax - 1) {
@@ -339,7 +339,7 @@ napi_value NAPI_OnRequestPermissionsFromUserResultWrap(
     NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, &jsthis, &data));
 
     if (argc > 0) {
-        HILOG_INFO("%{public}s called, argc=%{public}d", __func__, argc);
+        HILOG_INFO("%{public}s called, argc=%{public}zu", __func__, argc);
 
         napi_value resourceName = 0;
         NAPI_CALL(env,
@@ -668,7 +668,7 @@ napi_value NAPI_CanRequestPermission(napi_env env, napi_callback_info info)
 
 bool UnwrapParamVerifyPermission(napi_env env, size_t argc, napi_value *argv, AsyncJSCallbackInfo *asyncCallbackInfo)
 {
-    HILOG_INFO("%{public}s called, argc=%{public}d", __func__, argc);
+    HILOG_INFO("%{public}s called, argc=%{public}zu", __func__, argc);
 
     const size_t argcMax = 4;
     if (argc > argcMax || argc < argcMax - 1) {
diff --git a/tools/aa/src/ability_command.cpp b/tools/aa/src/ability_command.cpp
index 6957bbaae16740334aef1b6fde986ead909fec39..f152d526475ec1ea972fe22ee88c29474b65a082 100755
--- a/tools/aa/src/ability_command.cpp
+++ b/tools/aa/src/ability_command.cpp
@@ -235,6 +235,8 @@ ErrCode AbilityManagerShellCommand::RunAsHelpCommand()
 
 ErrCode AbilityManagerShellCommand::RunAsScreenCommand()
 {
+    HILOG_INFO("enter");
+
     int result = OHOS::ERR_OK;
 
     int option = -1;
@@ -278,9 +280,8 @@ ErrCode AbilityManagerShellCommand::RunAsScreenCommand()
                     // 'aa screen -p' with no argument
                     HILOG_INFO("'aa %{public}s -p' with no argument.", cmd_.c_str());
 
-                    resultReceiver_.append("error: option '");
-                    resultReceiver_.append(argv_[optind - 1]);
-                    resultReceiver_.append("' requires a value.\n");
+                    resultReceiver_.append("error: option ");
+                    resultReceiver_.append("requires a value.\n");
 
                     result = OHOS::ERR_INVALID_VALUE;
                     break;
@@ -291,8 +292,7 @@ ErrCode AbilityManagerShellCommand::RunAsScreenCommand()
                     std::string unknownOption = "";
                     std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption);
 
-                    HILOG_INFO(
-                        "'aa %{public}s' with an unknown option: %{public}s", unknownOption.c_str(), cmd_.c_str());
+                    HILOG_INFO("'aa screen' with an unknown option.");
 
                     resultReceiver_.append(unknownOptionMsg);
                     result = OHOS::ERR_INVALID_VALUE;
@@ -304,8 +304,7 @@ ErrCode AbilityManagerShellCommand::RunAsScreenCommand()
                     std::string unknownOption = "";
                     std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption);
 
-                    HILOG_INFO(
-                        "'aa %{public}s' with an unknown option: %{public}s", unknownOption.c_str(), cmd_.c_str());
+                    HILOG_INFO("'aa screen' with an unknown option.");
 
                     resultReceiver_.append(unknownOptionMsg);
                     result = OHOS::ERR_INVALID_VALUE;
@@ -530,9 +529,8 @@ ErrCode AbilityManagerShellCommand::RunAsDumpCommandOptopt()
             // 'aa dump --stack' with no argument: aa dump --stack
             HILOG_INFO("'aa dump -s' with no argument.");
 
-            resultReceiver_.append("error: option '");
-            resultReceiver_.append(argv_[optind - 1]);
-            resultReceiver_.append("' requires a value.\n");
+            resultReceiver_.append("error: option ");
+            resultReceiver_.append("requires a value.\n");
             result = OHOS::ERR_INVALID_VALUE;
             break;
         }
@@ -541,9 +539,8 @@ ErrCode AbilityManagerShellCommand::RunAsDumpCommandOptopt()
             // 'aa dump --mission' with no argument: aa dump --mission
             HILOG_INFO("'aa dump -m' with no argument.");
 
-            resultReceiver_.append("error: option '");
-            resultReceiver_.append(argv_[optind - 1]);
-            resultReceiver_.append("' requires a value.\n");
+            resultReceiver_.append("error: option ");
+            resultReceiver_.append("requires a value.\n");
             result = OHOS::ERR_INVALID_VALUE;
             break;
         }
@@ -553,7 +550,7 @@ ErrCode AbilityManagerShellCommand::RunAsDumpCommandOptopt()
             std::string unknownOption = "";
             std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption);
 
-            HILOG_INFO("'aa dump' with an unknown option: %{public}s", unknownOption.c_str());
+            HILOG_INFO("'aa dump' with an unknown option.");
 
             resultReceiver_.append(unknownOptionMsg);
             result = OHOS::ERR_INVALID_VALUE;
@@ -565,7 +562,7 @@ ErrCode AbilityManagerShellCommand::RunAsDumpCommandOptopt()
             std::string unknownOption = "";
             std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption);
 
-            HILOG_INFO("'aa dump' with an unknown option: %{public}s", unknownOption.c_str());
+            HILOG_INFO("'aa dump' with an unknown option.");
 
             resultReceiver_.append(unknownOptionMsg);
             result = OHOS::ERR_INVALID_VALUE;
@@ -626,9 +623,8 @@ ErrCode AbilityManagerShellCommand::MakeWantFromCmd(Want &want)
                     // 'aa stop-service -d' with no argument
                     HILOG_INFO("'aa %{public}s -d' with no argument.", cmd_.c_str());
 
-                    resultReceiver_.append("error: option '");
-                    resultReceiver_.append(argv_[optind - 1]);
-                    resultReceiver_.append("' requires a value.\n");
+                    resultReceiver_.append("error: option ");
+                    resultReceiver_.append("requires a value.\n");
 
                     result = OHOS::ERR_INVALID_VALUE;
                     break;
@@ -636,11 +632,10 @@ ErrCode AbilityManagerShellCommand::MakeWantFromCmd(Want &want)
                 case 'a': {
                     // 'aa start -a' with no argument
                     // 'aa stop-service -a' with no argument
-                    HILOG_INFO("'aa %{public}s -d' with no argument.", cmd_.c_str());
+                    HILOG_INFO("'aa %{public}s -a' with no argument.", cmd_.c_str());
 
-                    resultReceiver_.append("error: option '");
-                    resultReceiver_.append(argv_[optind - 1]);
-                    resultReceiver_.append("' requires a value.\n");
+                    resultReceiver_.append("error: option ");
+                    resultReceiver_.append("requires a value.\n");
 
                     result = OHOS::ERR_INVALID_VALUE;
                     break;
@@ -648,11 +643,10 @@ ErrCode AbilityManagerShellCommand::MakeWantFromCmd(Want &want)
                 case 'b': {
                     // 'aa start -b' with no argument
                     // 'aa stop-service -b' with no argument
-                    HILOG_INFO("'aa %{public}s -d' with no argument.", cmd_.c_str());
+                    HILOG_INFO("'aa %{public}s -b' with no argument.", cmd_.c_str());
 
-                    resultReceiver_.append("error: option '");
-                    resultReceiver_.append(argv_[optind - 1]);
-                    resultReceiver_.append("' requires a value.\n");
+                    resultReceiver_.append("error: option ");
+                    resultReceiver_.append("requires a value.\n");
 
                     result = OHOS::ERR_INVALID_VALUE;
                     break;
@@ -665,8 +659,7 @@ ErrCode AbilityManagerShellCommand::MakeWantFromCmd(Want &want)
                     std::string unknownOption = "";
                     std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption);
 
-                    HILOG_INFO(
-                        "'aa %{public}s' with an unknown option: %{public}s", unknownOption.c_str(), cmd_.c_str());
+                    HILOG_INFO("'aa %{public}s' with an unknown option.", cmd_.c_str());
 
                     resultReceiver_.append(unknownOptionMsg);
                     result = OHOS::ERR_INVALID_VALUE;
@@ -680,8 +673,7 @@ ErrCode AbilityManagerShellCommand::MakeWantFromCmd(Want &want)
                     std::string unknownOption = "";
                     std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption);
 
-                    HILOG_INFO(
-                        "'aa %{public}s' with an unknown option: %{public}s", unknownOption.c_str(), cmd_.c_str());
+                    HILOG_INFO("'aa %{public}s' with an unknown option.", cmd_.c_str());
 
                     resultReceiver_.append(unknownOptionMsg);
                     result = OHOS::ERR_INVALID_VALUE;
diff --git a/tools/aa/src/shell_command.cpp b/tools/aa/src/shell_command.cpp
index ff5d05d25a6d1f6015a2972d23f21b975b9d5d8e..3af60cc9ef696f8e59789cc6ab028fe5a59f7eff 100644
--- a/tools/aa/src/shell_command.cpp
+++ b/tools/aa/src/shell_command.cpp
@@ -98,15 +98,8 @@ std::string ShellCommand::GetUnknownOptionMsg(std::string &unknownOption) const
         return result;
     }
 
-    if (argv_[optind] && strlen(argv_[optind])) {
-        unknownOption = argv_[optind];
-    } else {
-        unknownOption = argv_[optind - 1];
-    }
-
-    result.append("error: unknown option '");
-    result.append(unknownOption);
-    result.append("'.\n");
+    result.append("error: unknown option");
+    result.append(".\n");
 
     return result;
 }
diff --git a/tools/test/unittest/aa/ability_command_dump_test.cpp b/tools/test/unittest/aa/ability_command_dump_test.cpp
index be53d37140e8d6d094c9a669a4dd9dbff912f4f2..3f2e6884e57c40e8be7fb418028343036d2f07f7 100644
--- a/tools/test/unittest/aa/ability_command_dump_test.cpp
+++ b/tools/test/unittest/aa/ability_command_dump_test.cpp
@@ -126,7 +126,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0300, Function | MediumTest | Level1
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-x'.\n" + HELP_MSG_DUMP);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMP);
 }
 
 /**
@@ -145,7 +145,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0400, Function | MediumTest | Level1
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-xxx'.\n" + HELP_MSG_DUMP);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMP);
 }
 
 /**
@@ -164,7 +164,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0500, Function | MediumTest | Level1
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--x'.\n" + HELP_MSG_DUMP);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMP);
 }
 
 /**
@@ -183,7 +183,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0600, Function | MediumTest | Level1
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--xxx'.\n" + HELP_MSG_DUMP);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMP);
 }
 
 /**
@@ -278,7 +278,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1100, Function | MediumTest | Level1
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-s' requires a value.\n" + HELP_MSG_DUMP);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_DUMP);
 }
 
 /**
@@ -317,7 +317,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1300, Function | MediumTest | Level1
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-m' requires a value.\n" + HELP_MSG_DUMP);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_DUMP);
 }
 
 /**
diff --git a/tools/test/unittest/aa/ability_command_screen_test.cpp b/tools/test/unittest/aa/ability_command_screen_test.cpp
index 2595040beb16cd5caf61b048c995efb1d0f2aeaf..7ed8775cde1d62674fa8b8c4e44c2f28b69ad1a7 100644
--- a/tools/test/unittest/aa/ability_command_screen_test.cpp
+++ b/tools/test/unittest/aa/ability_command_screen_test.cpp
@@ -121,7 +121,7 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_0300, Function | MediumTest | Le
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-x'.\n" + HELP_MSG_SCREEN);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_SCREEN);
 }
 
 /**
@@ -140,7 +140,7 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_0400, Function | MediumTest | Le
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-xxx'.\n" + HELP_MSG_SCREEN);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_SCREEN);
 }
 
 /**
@@ -159,7 +159,7 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_0500, Function | MediumTest | Le
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--x'.\n" + HELP_MSG_SCREEN);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_SCREEN);
 }
 
 /**
@@ -178,7 +178,7 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_0600, Function | MediumTest | Le
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--xxx'.\n" + HELP_MSG_SCREEN);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_SCREEN);
 }
 
 /**
@@ -235,7 +235,7 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_0900, Function | MediumTest | Le
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-p' requires a value.\n" + HELP_MSG_SCREEN);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_SCREEN);
 }
 
 /**
@@ -244,31 +244,6 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_0900, Function | MediumTest | Le
  * @tc.desc: Verify the "aa screen -p <state>" command.
  */
 HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_1000, Function | MediumTest | Level1)
-{
-    auto managerClientPtr = AbilityManagerClient::GetInstance();
-    auto managerStubPtr = (MockAbilityManagerStub *)managerClientPtr->remoteObject_.GetRefPtr();
-
-    managerStubPtr->powerState_ = STRING_STATE_ON_INVALID;
-
-    char *argv[] = {
-        (char *)TOOL_NAME.c_str(),
-        (char *)cmd_.c_str(),
-        (char *)"-p",
-        (char *)STRING_STATE_ON_INVALID.c_str(),
-        (char *)"",
-    };
-    int argc = sizeof(argv) / sizeof(argv[0]) - 1;
-
-    AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), STRING_SCREEN_POWER_ON_NG + "\n");
-}
-
-/**
- * @tc.number: Aa_Command_Screen_1100
- * @tc.name: ExecCommand
- * @tc.desc: Verify the "aa screen -p <state>" command.
- */
-HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_1100, Function | MediumTest | Level1)
 {
     char *argv[] = {
         (char *)TOOL_NAME.c_str(),
@@ -284,36 +259,11 @@ HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_1100, Function | MediumTest | Le
 }
 
 /**
- * @tc.number: Aa_Command_Screen_1200
- * @tc.name: ExecCommand
- * @tc.desc: Verify the "aa screen -p <state>" command.
- */
-HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_1200, Function | MediumTest | Level1)
-{
-    auto managerClientPtr = AbilityManagerClient::GetInstance();
-    auto managerStubPtr = (MockAbilityManagerStub *)managerClientPtr->remoteObject_.GetRefPtr();
-
-    managerStubPtr->powerState_ = STRING_STATE_OFF_INVALID;
-
-    char *argv[] = {
-        (char *)TOOL_NAME.c_str(),
-        (char *)cmd_.c_str(),
-        (char *)"-p",
-        (char *)STRING_STATE_OFF_INVALID.c_str(),
-        (char *)"",
-    };
-    int argc = sizeof(argv) / sizeof(argv[0]) - 1;
-
-    AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), STRING_SCREEN_POWER_OFF_NG + "\n");
-}
-
-/**
- * @tc.number: Aa_Command_Screen_1300
+ * @tc.number: Aa_Command_Screen_1100
  * @tc.name: ExecCommand
  * @tc.desc: Verify the "aa screen -p <state>" command.
  */
-HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_1300, Function | MediumTest | Level1)
+HWTEST_F(AaCommandScreenTest, Aa_Command_Screen_1100, Function | MediumTest | Level1)
 {
     char *argv[] = {
         (char *)TOOL_NAME.c_str(),
diff --git a/tools/test/unittest/aa/ability_command_start_test.cpp b/tools/test/unittest/aa/ability_command_start_test.cpp
index f20b8a9c95ac4c216510362ca60a6deedccaa096..53ca239f5f7eb730c0ff42692d567d7240d78939 100644
--- a/tools/test/unittest/aa/ability_command_start_test.cpp
+++ b/tools/test/unittest/aa/ability_command_start_test.cpp
@@ -121,7 +121,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_0300, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-x'.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_START);
 }
 
 /**
@@ -140,7 +140,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_0400, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-xxx'.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_START);
 }
 
 /**
@@ -159,7 +159,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_0500, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--x'.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_START);
 }
 
 /**
@@ -178,7 +178,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_0600, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--xxx'.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_START);
 }
 
 /**
@@ -235,7 +235,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_0900, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-d' requires a value.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_START);
 }
 
 /**
@@ -277,7 +277,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_1100, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-a' requires a value.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_START);
 }
 
 /**
@@ -320,7 +320,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_1300, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-b' requires a value.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_START);
 }
 
 /**
@@ -365,7 +365,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_1500, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-b' requires a value.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_START);
 }
 
 /**
@@ -408,7 +408,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_1700, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-a' requires a value.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_START);
 }
 
 /**
@@ -429,7 +429,7 @@ HWTEST_F(AaCommandStartTest, Aa_Command_Start_1800, Function | MediumTest | Leve
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-b' requires a value.\n" + HELP_MSG_START);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_START);
 }
 
 /**
diff --git a/tools/test/unittest/aa/ability_command_stop_service_test.cpp b/tools/test/unittest/aa/ability_command_stop_service_test.cpp
index 18a90983d2ce7f47ce2e93fb80e9308877a0618c..d6efcbc444cbd37117219640ae2ed96fe7dd131e 100644
--- a/tools/test/unittest/aa/ability_command_stop_service_test.cpp
+++ b/tools/test/unittest/aa/ability_command_stop_service_test.cpp
@@ -121,7 +121,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_0300, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-x'.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -140,7 +140,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_0400, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '-xxx'.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -159,7 +159,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_0500, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--x'.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -178,7 +178,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_0600, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option '--xxx'.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -235,7 +235,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_0900, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-d' requires a value.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -277,7 +277,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_1100, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-a' requires a value.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -320,7 +320,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_1300, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-b' requires a value.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -365,7 +365,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_1500, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-b' requires a value.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -408,7 +408,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_1700, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-a' requires a value.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**
@@ -429,7 +429,7 @@ HWTEST_F(AaCommandStopServiceTest, Aa_Command_StopService_1800, Function | Mediu
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
     AbilityManagerShellCommand cmd(argc, argv);
-    EXPECT_EQ(cmd.ExecCommand(), "error: option '-b' requires a value.\n" + HELP_MSG_STOP_SERVICE);
+    EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_STOP_SERVICE);
 }
 
 /**