carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Don't print a comma in a two-item list. (#4596)

Browse Source
This commit is contained in:
Richard Smith
2024-11-26 22:48:00 +00:00
committed by GitHub
parent 6468450c95
commit c571b0f13b
2 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/command_line_test.cpp
+58 -23
View File
@@ -361,7 +361,7 @@ TEST(ArgParserTest, BasicSubcommands) {
EXPECT_THAT(parse({"sub2", "--option=abc", "subsub42", "--option=xyz"}, os),
IsError(StrEq("invalid subcommand `subsub42`; available "
"subcommands: `subsub`, or `help`")));
"subcommands: `subsub` or `help`")));
EXPECT_THAT(
parse({"sub2", "--option=abc", "subsub", "--option=xyz"}, llvm::errs()),
@@ -434,20 +434,27 @@ TEST(ArgParserTest, PositionalAppending) {
EXPECT_THAT(strings3, ElementsAre(StrEq("e"), StrEq("f")));
}
static auto ParseOneOfOption(llvm::ArrayRef<llvm::StringRef> args,
llvm::raw_ostream& s,
llvm::function_ref<void(OneOfArgBuilder&)> build)
-> ErrorOr<ParseResult> {
return Parse(args, s, TestCommandInfo, [&](auto& b) {
b.AddOneOfOption({.name = "option"}, build);
b.Do([] {});
});
}
TEST(ArgParserTest, OneOfOption) {
int value = 0;
auto parse = [&](llvm::ArrayRef<llvm::StringRef> args, llvm::raw_ostream& s) {
return Parse(args, s, TestCommandInfo, [&](auto& b) {
b.AddOneOfOption({.name = "option"}, [&](auto& arg_b) {
arg_b.SetOneOf(
{
arg_b.OneOfValue("x", 1),
arg_b.OneOfValue("y", 2),
arg_b.OneOfValue("z", 3),
},
&value);
});
b.Do([] {});
return ParseOneOfOption(args, s, [&](auto& arg_b) {
arg_b.SetOneOf(
{
arg_b.OneOfValue("x", 1),
arg_b.OneOfValue("y", 2),
arg_b.OneOfValue("z", 3),
},
&value);
});
};
@@ -489,20 +496,48 @@ TEST(ArgParserTest, OneOfOption) {
IsError(StrEq(llvm::formatv(ErrorStr, "\\00"))));
}
TEST(ArgParserTest, OneOfOptionWithTwoOptions) {
int value = 0;
TestRawOstream os;
EXPECT_THAT(ParseOneOfOption({"--option=z"}, os,
[&](auto& arg_b) {
arg_b.SetOneOf(
{
arg_b.OneOfValue("x", 1),
arg_b.OneOfValue("y", 2),
},
&value);
}),
IsError(StrEq("option `--option=z` has an invalid value `z`; "
"valid values are: `x` or `y`")));
}
TEST(ArgParserTest, OneOfOptionWithOneOption) {
int value = 0;
TestRawOstream os;
EXPECT_THAT(ParseOneOfOption({"--option=z"}, os,
[&](auto& arg_b) {
arg_b.SetOneOf(
{
arg_b.OneOfValue("x", 1),
},
&value);
}),
IsError(StrEq("option `--option=z` has an invalid value `z`; "
"valid values are: `x`")));
}
TEST(ArgParserTest, OneOfOptionAppending) {
llvm::SmallVector<int> values;
auto parse = [&](llvm::ArrayRef<llvm::StringRef> args, llvm::raw_ostream& s) {
return Parse(args, s, TestCommandInfo, [&](auto& b) {
b.AddOneOfOption({.name = "option"}, [&](auto& arg_b) {
arg_b.AppendOneOf(
{
arg_b.OneOfValue("x", 1),
arg_b.OneOfValue("y", 2),
arg_b.OneOfValue("z", 3),
},
&values);
});
b.Do([] {});
return ParseOneOfOption(args, s, [&](auto& arg_b) {
arg_b.AppendOneOf(
{
arg_b.OneOfValue("x", 1),
arg_b.OneOfValue("y", 2),
arg_b.OneOfValue("z", 3),
},
&values);
});
};