diff --git a/tools/aa/src/ability_command.cpp b/tools/aa/src/ability_command.cpp index 2b5d3c7add..e120b8b8c6 100644 --- a/tools/aa/src/ability_command.cpp +++ b/tools/aa/src/ability_command.cpp @@ -587,21 +587,22 @@ ErrCode AbilityManagerShellCommand::RunAsDumpsysCommand() } case '?': { if (!isfirstCommand) { - result = OHOS::ERR_INVALID_VALUE; + HILOG_INFO("'aa %{public}s' with an unknown option.", cmd_.c_str()); + std::string unknownOption = ""; + std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption); + resultReceiver_.append(unknownOptionMsg); resultReceiver_.append(HELP_MSG_DUMPSYS); + result = OHOS::ERR_INVALID_VALUE; return result; } break; } default: { - if (strcmp(argv_[optind], cmd_.c_str()) == 0) { - // 'aa dumpsys' with no option: aa dumpsys - // 'aa dumpsys' with a wrong argument: aa dumpsys xxx - HILOG_INFO("'aa dumpsys' with no option."); - - resultReceiver_.append(HELP_MSG_NO_OPTION + "\n"); - result = OHOS::ERR_INVALID_VALUE; - } + HILOG_INFO("'aa %{public}s' with an unknown option.", cmd_.c_str()); + std::string unknownOption = ""; + std::string unknownOptionMsg = GetUnknownOptionMsg(unknownOption); + resultReceiver_.append(unknownOptionMsg); + result = OHOS::ERR_INVALID_VALUE; break; } } diff --git a/tools/test/moduletest/aa/BUILD.gn b/tools/test/moduletest/aa/BUILD.gn index ed1560d5c6..ae5fddb049 100644 --- a/tools/test/moduletest/aa/BUILD.gn +++ b/tools/test/moduletest/aa/BUILD.gn @@ -136,8 +136,7 @@ group("moduletest") { deps = [ ":aa_command_dump_module_test", - - # ":aa_command_dumpsys_module_test", + ":aa_command_dumpsys_module_test", ":aa_command_start_module_test", ":aa_command_stop_service_module_test", ] diff --git a/tools/test/unittest/aa/BUILD.gn b/tools/test/unittest/aa/BUILD.gn index 7bb77345d8..3961b47778 100644 --- a/tools/test/unittest/aa/BUILD.gn +++ b/tools/test/unittest/aa/BUILD.gn @@ -186,7 +186,7 @@ group("unittest") { testonly = true deps = [ - # ":aa_command_dump_test", + ":aa_command_dump_test", ":aa_command_dumpsys_test", ":aa_command_screen_test", ":aa_command_start_test", diff --git a/tools/test/unittest/aa/aa_command_dump_test.cpp b/tools/test/unittest/aa/aa_command_dump_test.cpp index 304c3c6d46..be7357f17a 100644 --- a/tools/test/unittest/aa/aa_command_dump_test.cpp +++ b/tools/test/unittest/aa/aa_command_dump_test.cpp @@ -88,7 +88,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0100, Function | MediumTest | Level1 int argc = sizeof(argv) / sizeof(argv[0]) - 1; AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_NO_OPTION + "\n" + HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_NO_OPTION + "\n" + HELP_MSG_DUMPSYS); } /** @@ -107,7 +107,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0200, Function | MediumTest | Level1 int argc = sizeof(argv) / sizeof(argv[0]) - 1; AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_NO_OPTION + "\n" + HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_NO_OPTION + "\n" + HELP_MSG_DUMPSYS); } /** @@ -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.\n" + HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMPSYS); } /** @@ -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.\n" + HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMPSYS); } /** @@ -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.\n" + HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMPSYS); } /** @@ -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.\n" + HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), "error: unknown option.\n" + HELP_MSG_DUMPSYS); } /** @@ -202,7 +202,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0700, Function | MediumTest | Level1 int argc = sizeof(argv) / sizeof(argv[0]) - 1; AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_DUMPSYS); } /** @@ -221,7 +221,7 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_0800, Function | MediumTest | Level1 int argc = sizeof(argv) / sizeof(argv[0]) - 1; AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_DUMP); + EXPECT_EQ(cmd.ExecCommand(), HELP_MSG_DUMPSYS); } /** @@ -262,80 +262,3 @@ HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1000, Function | MediumTest | Level1 EXPECT_EQ(cmd.ExecCommand(), ""); } -/** - * @tc.number: Aa_Command_Dump_1100 - * @tc.name: ExecCommand - * @tc.desc: Verify the "aa dump -s" command. - */ -HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1100, Function | MediumTest | Level1) -{ - char *argv[] = { - (char *)TOOL_NAME.c_str(), - (char *)cmd_.c_str(), - (char *)"-s", - (char *)"", - }; - int argc = sizeof(argv) / sizeof(argv[0]) - 1; - - AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_DUMP); -} - -/** - * @tc.number: Aa_Command_Dump_1200 - * @tc.name: ExecCommand - * @tc.desc: Verify the "aa dump -s " command. - */ -HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1200, Function | MediumTest | Level1) -{ - char *argv[] = { - (char *)TOOL_NAME.c_str(), - (char *)cmd_.c_str(), - (char *)"-s", - (char *)STRING_STACK_NUMBER.c_str(), - (char *)"", - }; - int argc = sizeof(argv) / sizeof(argv[0]) - 1; - - AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), STRING_STACK_NUMBER + "\n"); -} - -/** - * @tc.number: Aa_Command_Dump_1300 - * @tc.name: ExecCommand - * @tc.desc: Verify the "aa dump -m" command. - */ -HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1300, Function | MediumTest | Level1) -{ - char *argv[] = { - (char *)TOOL_NAME.c_str(), - (char *)cmd_.c_str(), - (char *)"-m", - (char *)"", - }; - int argc = sizeof(argv) / sizeof(argv[0]) - 1; - - AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), "error: option requires a value.\n" + HELP_MSG_DUMP); -} - -/** - * @tc.number: Aa_Command_Dump_1400 - * @tc.name: ExecCommand - * @tc.desc: Verify the "aa dump -m " command. - */ -HWTEST_F(AaCommandDumpTest, Aa_Command_Dump_1400, Function | MediumTest | Level1) -{ - char *argv[] = { - (char *)TOOL_NAME.c_str(), - (char *)cmd_.c_str(), - (char *)"-m", - (char *)STRING_MISSION_NUMBER.c_str(), - (char *)"", - }; - int argc = sizeof(argv) / sizeof(argv[0]) - 1; - - AbilityManagerShellCommand cmd(argc, argv); - EXPECT_EQ(cmd.ExecCommand(), STRING_MISSION_NUMBER + "\n"); -}