diff options
Diffstat (limited to 'llvm/unittests/Support/CommandLineTest.cpp')
-rw-r--r-- | llvm/unittests/Support/CommandLineTest.cpp | 89 |
1 files changed, 44 insertions, 45 deletions
diff --git a/llvm/unittests/Support/CommandLineTest.cpp b/llvm/unittests/Support/CommandLineTest.cpp index 4e1160f..8032d0e7 100644 --- a/llvm/unittests/Support/CommandLineTest.cpp +++ b/llvm/unittests/Support/CommandLineTest.cpp @@ -101,8 +101,7 @@ TEST(CommandLineTest, ModifyExisitingOption) { StringMap<cl::Option *> &Map = cl::getRegisteredOptions(*cl::TopLevelSubCommand); - ASSERT_TRUE(Map.count("test-option") == 1) << - "Could not find option in map."; + ASSERT_EQ(Map.count("test-option"), 1u) << "Could not find option in map."; cl::Option *Retrieved = Map["test-option"]; ASSERT_EQ(&TestOption, Retrieved) << "Retrieved wrong option."; @@ -701,7 +700,7 @@ TEST(CommandLineTest, DefaultOptions) { const char *args0[] = {"prog", "-b", "args0 bar string", "-f"}; EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args0) / sizeof(char *), args0, StringRef(), &llvm::nulls())); - EXPECT_TRUE(Bar == "args0 bar string"); + EXPECT_EQ(Bar, "args0 bar string"); EXPECT_TRUE(Foo); EXPECT_FALSE(SC1_B); EXPECT_TRUE(SC2_Foo.empty()); @@ -711,7 +710,7 @@ TEST(CommandLineTest, DefaultOptions) { const char *args1[] = {"prog", "sc1", "-b", "-bar", "args1 bar string", "-f"}; EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args1) / sizeof(char *), args1, StringRef(), &llvm::nulls())); - EXPECT_TRUE(Bar == "args1 bar string"); + EXPECT_EQ(Bar, "args1 bar string"); EXPECT_TRUE(Foo); EXPECT_TRUE(SC1_B); EXPECT_TRUE(SC2_Foo.empty()); @@ -727,10 +726,10 @@ TEST(CommandLineTest, DefaultOptions) { "-f", "-foo", "foo string"}; EXPECT_TRUE(cl::ParseCommandLineOptions(sizeof(args2) / sizeof(char *), args2, StringRef(), &llvm::nulls())); - EXPECT_TRUE(Bar == "args2 bar string"); + EXPECT_EQ(Bar, "args2 bar string"); EXPECT_TRUE(Foo); EXPECT_FALSE(SC1_B); - EXPECT_TRUE(SC2_Foo == "foo string"); + EXPECT_EQ(SC2_Foo, "foo string"); for (auto *S : cl::getRegisteredSubcommands()) { if (*S) { EXPECT_EQ("sc2", S->getName()); @@ -777,8 +776,8 @@ TEST(CommandLineTest, ResponseFileWindows) { EXPECT_TRUE( cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls())); EXPECT_TRUE(TopLevelOpt); - EXPECT_TRUE(InputFilenames[0] == "path\\dir\\file1"); - EXPECT_TRUE(InputFilenames[1] == "path/dir/file2"); + EXPECT_EQ(InputFilenames[0], "path\\dir\\file1"); + EXPECT_EQ(InputFilenames[1], "path/dir/file2"); } TEST(CommandLineTest, ResponseFiles) { @@ -1011,9 +1010,9 @@ TEST(CommandLineTest, SetDefautValue) { EXPECT_TRUE( cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls())); - EXPECT_TRUE(Opt1 == "false"); + EXPECT_EQ(Opt1, "false"); EXPECT_TRUE(Opt2); - EXPECT_TRUE(Opt3 == 3); + EXPECT_EQ(Opt3, 3); Opt2 = false; Opt3 = 1; @@ -1028,9 +1027,9 @@ TEST(CommandLineTest, SetDefautValue) { O->setDefault(); } - EXPECT_TRUE(Opt1 == "true"); + EXPECT_EQ(Opt1, "true"); EXPECT_TRUE(Opt2); - EXPECT_TRUE(Opt3 == 3); + EXPECT_EQ(Opt3, 3); Alias.removeArgument(); } @@ -1135,8 +1134,8 @@ TEST(CommandLineTest, PositionalEatArgsError) { cl::ResetAllOptionOccurrences(); EXPECT_TRUE(cl::ParseCommandLineOptions(6, args4, StringRef(), &OS)); OS.flush(); - EXPECT_TRUE(PosEatArgs.size() == 1); - EXPECT_TRUE(PosEatArgs2.size() == 2); + EXPECT_EQ(PosEatArgs.size(), 1u); + EXPECT_EQ(PosEatArgs2.size(), 2u); EXPECT_TRUE(Errs.empty()); } @@ -1412,8 +1411,8 @@ TEST(CommandLineTest, PrefixOptions) { const char *args[] = {"prog", "-I=/usr/include"}; EXPECT_TRUE( cl::ParseCommandLineOptions(2, args, StringRef(), &llvm::nulls())); - EXPECT_TRUE(IncludeDirs.size() == 1); - EXPECT_TRUE(IncludeDirs.front().compare("/usr/include") == 0); + EXPECT_EQ(IncludeDirs.size(), 1u); + EXPECT_EQ(IncludeDirs.front().compare("/usr/include"), 0); IncludeDirs.erase(IncludeDirs.begin()); cl::ResetAllOptionOccurrences(); @@ -1424,8 +1423,8 @@ TEST(CommandLineTest, PrefixOptions) { const char *args2[] = {"prog", "-I", "/usr/include"}; EXPECT_TRUE( cl::ParseCommandLineOptions(3, args2, StringRef(), &llvm::nulls())); - EXPECT_TRUE(IncludeDirs.size() == 1); - EXPECT_TRUE(IncludeDirs.front().compare("/usr/include") == 0); + EXPECT_EQ(IncludeDirs.size(), 1u); + EXPECT_EQ(IncludeDirs.front().compare("/usr/include"), 0); IncludeDirs.erase(IncludeDirs.begin()); cl::ResetAllOptionOccurrences(); @@ -1435,8 +1434,8 @@ TEST(CommandLineTest, PrefixOptions) { const char *args3[] = {"prog", "-I/usr/include"}; EXPECT_TRUE( cl::ParseCommandLineOptions(2, args3, StringRef(), &llvm::nulls())); - EXPECT_TRUE(IncludeDirs.size() == 1); - EXPECT_TRUE(IncludeDirs.front().compare("/usr/include") == 0); + EXPECT_EQ(IncludeDirs.size(), 1u); + EXPECT_EQ(IncludeDirs.front().compare("/usr/include"), 0); StackOption<std::string, cl::list<std::string>> MacroDefs( "D", cl::AlwaysPrefix, cl::desc("Define a macro"), @@ -1450,8 +1449,8 @@ TEST(CommandLineTest, PrefixOptions) { const char *args4[] = {"prog", "-D=HAVE_FOO"}; EXPECT_TRUE( cl::ParseCommandLineOptions(2, args4, StringRef(), &llvm::nulls())); - EXPECT_TRUE(MacroDefs.size() == 1); - EXPECT_TRUE(MacroDefs.front().compare("=HAVE_FOO") == 0); + EXPECT_EQ(MacroDefs.size(), 1u); + EXPECT_EQ(MacroDefs.front().compare("=HAVE_FOO"), 0); MacroDefs.erase(MacroDefs.begin()); cl::ResetAllOptionOccurrences(); @@ -1471,8 +1470,8 @@ TEST(CommandLineTest, PrefixOptions) { const char *args6[] = {"prog", "-DHAVE_FOO"}; EXPECT_TRUE( cl::ParseCommandLineOptions(2, args6, StringRef(), &llvm::nulls())); - EXPECT_TRUE(MacroDefs.size() == 1); - EXPECT_TRUE(MacroDefs.front().compare("HAVE_FOO") == 0); + EXPECT_EQ(MacroDefs.size(), 1u); + EXPECT_EQ(MacroDefs.front().compare("HAVE_FOO"), 0); } TEST(CommandLineTest, GroupingWithValue) { @@ -1757,12 +1756,12 @@ TEST(CommandLineTest, OptionErrorMessage) { OptA.error("custom error", OS); OS.flush(); - EXPECT_FALSE(Errs.find("for the -a option:") == std::string::npos); + EXPECT_NE(Errs.find("for the -a option:"), std::string::npos); Errs.clear(); OptLong.error("custom error", OS); OS.flush(); - EXPECT_FALSE(Errs.find("for the --long option:") == std::string::npos); + EXPECT_NE(Errs.find("for the --long option:"), std::string::npos); Errs.clear(); cl::ResetAllOptionOccurrences(); @@ -1785,8 +1784,8 @@ TEST(CommandLineTest, OptionErrorMessageSuggest) { EXPECT_FALSE(cl::ParseCommandLineOptions(2, args, StringRef(), &OS)); OS.flush(); - EXPECT_FALSE(Errs.find("prog: Did you mean '--aluminium'?\n") == - std::string::npos); + EXPECT_NE(Errs.find("prog: Did you mean '--aluminium'?\n"), + std::string::npos); Errs.clear(); cl::ResetAllOptionOccurrences(); @@ -1808,8 +1807,8 @@ TEST(CommandLineTest, OptionErrorMessageSuggestNoHidden) { EXPECT_FALSE(cl::ParseCommandLineOptions(2, args, StringRef(), &OS)); OS.flush(); - EXPECT_FALSE(Errs.find("prog: Did you mean '--aluminium'?\n") == - std::string::npos); + EXPECT_NE(Errs.find("prog: Did you mean '--aluminium'?\n"), + std::string::npos); Errs.clear(); cl::ResetAllOptionOccurrences(); @@ -1840,7 +1839,7 @@ TEST(CommandLineTest, Callback) { EXPECT_TRUE(OptA); EXPECT_FALSE(OptB); EXPECT_FALSE(OptC); - EXPECT_TRUE(List.size() == 0); + EXPECT_EQ(List.size(), 0u); cl::ResetAllOptionOccurrences(); const char *args2[] = {"prog", "-b"}; @@ -1848,7 +1847,7 @@ TEST(CommandLineTest, Callback) { EXPECT_TRUE(OptA); EXPECT_TRUE(OptB); EXPECT_FALSE(OptC); - EXPECT_TRUE(List.size() == 0); + EXPECT_EQ(List.size(), 0u); cl::ResetAllOptionOccurrences(); const char *args3[] = {"prog", "-c"}; @@ -1856,7 +1855,7 @@ TEST(CommandLineTest, Callback) { EXPECT_TRUE(OptA); EXPECT_TRUE(OptB); EXPECT_TRUE(OptC); - EXPECT_TRUE(List.size() == 0); + EXPECT_EQ(List.size(), 0u); cl::ResetAllOptionOccurrences(); const char *args4[] = {"prog", "--list=foo,bar"}; @@ -1864,7 +1863,7 @@ TEST(CommandLineTest, Callback) { EXPECT_TRUE(OptA); EXPECT_TRUE(OptB); EXPECT_TRUE(OptC); - EXPECT_TRUE(List.size() == 2); + EXPECT_EQ(List.size(), 2u); cl::ResetAllOptionOccurrences(); const char *args5[] = {"prog", "--list=bar"}; @@ -1872,7 +1871,7 @@ TEST(CommandLineTest, Callback) { EXPECT_FALSE(OptA); EXPECT_FALSE(OptB); EXPECT_FALSE(OptC); - EXPECT_TRUE(List.size() == 1); + EXPECT_EQ(List.size(), 1u); cl::ResetAllOptionOccurrences(); } @@ -1899,9 +1898,9 @@ TEST(CommandLineTest, ConsumeAfterOnePositional) { EXPECT_TRUE(cl::ParseCommandLineOptions(4, Args, StringRef(), &OS)); OS.flush(); EXPECT_EQ("input", Input); - EXPECT_TRUE(ExtraArgs.size() == 2); - EXPECT_TRUE(ExtraArgs[0] == "arg1"); - EXPECT_TRUE(ExtraArgs[1] == "arg2"); + EXPECT_EQ(ExtraArgs.size(), 2u); + EXPECT_EQ(ExtraArgs[0], "arg1"); + EXPECT_EQ(ExtraArgs[1], "arg2"); EXPECT_TRUE(Errs.empty()); } @@ -1923,9 +1922,9 @@ TEST(CommandLineTest, ConsumeAfterTwoPositionals) { OS.flush(); EXPECT_EQ("input1", Input1); EXPECT_EQ("input2", Input2); - EXPECT_TRUE(ExtraArgs.size() == 2); - EXPECT_TRUE(ExtraArgs[0] == "arg1"); - EXPECT_TRUE(ExtraArgs[1] == "arg2"); + EXPECT_EQ(ExtraArgs.size(), 2u); + EXPECT_EQ(ExtraArgs[0], "arg1"); + EXPECT_EQ(ExtraArgs[1], "arg2"); EXPECT_TRUE(Errs.empty()); } @@ -1946,17 +1945,17 @@ TEST(CommandLineTest, ResetAllOptionOccurrences) { EXPECT_TRUE(OS.str().empty()); EXPECT_TRUE(Option); - EXPECT_EQ(1, (int)Sink.size()); + EXPECT_EQ(1u, Sink.size()); EXPECT_EQ("-unknown", Sink[0]); EXPECT_EQ("input", Input); - EXPECT_EQ(1, (int)ExtraArgs.size()); + EXPECT_EQ(1u, ExtraArgs.size()); EXPECT_EQ("-arg", ExtraArgs[0]); cl::ResetAllOptionOccurrences(); EXPECT_FALSE(Option); - EXPECT_EQ(0, (int)Sink.size()); + EXPECT_EQ(0u, Sink.size()); EXPECT_EQ(0, Input.getNumOccurrences()); - EXPECT_EQ(0, (int)ExtraArgs.size()); + EXPECT_EQ(0u, ExtraArgs.size()); } } // anonymous namespace |