diff options
author | 2017-04-05 17:33:07 -0800 | |
---|---|---|
committer | 2017-04-05 19:06:46 -0700 | |
commit | 4c9ec814db9e01c5ad25b6fed2745bf8abbe9706 (patch) | |
tree | 0637d05c6f912f8be158543d9d2a1d1416b3bef8 /tensorflow/core/util/command_line_flags_test.cc | |
parent | 88feb346baaf8a344f7c6b02f474277962081b58 (diff) |
Automated rollback of change 152332221
Change: 152333917
Diffstat (limited to 'tensorflow/core/util/command_line_flags_test.cc')
-rw-r--r-- | tensorflow/core/util/command_line_flags_test.cc | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/tensorflow/core/util/command_line_flags_test.cc b/tensorflow/core/util/command_line_flags_test.cc index 62025463af..b002e35899 100644 --- a/tensorflow/core/util/command_line_flags_test.cc +++ b/tensorflow/core/util/command_line_flags_test.cc @@ -32,35 +32,29 @@ std::vector<char *> CharPointerVectorFromStrings( } return result; } -} // namespace +} TEST(CommandLineFlagsTest, BasicUsage) { int some_int = 10; int64 some_int64 = 21474836470; // max int32 is 2147483647 bool some_switch = false; string some_name = "something"; - float some_float = -23.23f; - int argc = 6; - std::vector<string> argv_strings = {"program_name", - "--some_int=20", - "--some_int64=214748364700", - "--some_switch", - "--some_name=somethingelse", - "--some_float=42.0"}; + int argc = 5; + std::vector<string> argv_strings = { + "program_name", "--some_int=20", "--some_int64=214748364700", + "--some_switch", "--some_name=somethingelse"}; std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings); bool parsed_ok = Flags::Parse(&argc, argv_array.data(), {Flag("some_int", &some_int, "some int"), Flag("some_int64", &some_int64, "some int64"), Flag("some_switch", &some_switch, "some switch"), - Flag("some_name", &some_name, "some name"), - Flag("some_float", &some_float, "some float")}); + Flag("some_name", &some_name, "some name")}); EXPECT_EQ(true, parsed_ok); EXPECT_EQ(20, some_int); EXPECT_EQ(214748364700, some_int64); EXPECT_EQ(true, some_switch); EXPECT_EQ("somethingelse", some_name); - EXPECT_NEAR(42.0f, some_float, 1e-5f); EXPECT_EQ(argc, 1); } @@ -91,21 +85,6 @@ TEST(CommandLineFlagsTest, BadBoolValue) { EXPECT_EQ(argc, 1); } -TEST(CommandLineFlagsTest, BadFloatValue) { - float some_float = -23.23f; - int argc = 2; - std::vector<string> argv_strings = {"program_name", - "--some_float=notanumber"}; - std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings); - bool parsed_ok = - Flags::Parse(&argc, argv_array.data(), - {Flag("some_float", &some_float, "some float")}); - - EXPECT_EQ(false, parsed_ok); - EXPECT_NEAR(-23.23f, some_float, 1e-5f); - EXPECT_EQ(argc, 1); -} - // Return whether str==pat, but allowing any whitespace in pat // to match zero or more whitespace characters in str. static bool MatchWithAnyWhitespace(const string &str, const string &pat) { @@ -132,8 +111,6 @@ TEST(CommandLineFlagsTest, UsageString) { int64 some_int64 = 21474836470; // max int32 is 2147483647 bool some_switch = false; string some_name = "something"; - // Don't test float in this case, because precision is hard to predict and - // match against, and we don't want a flakey test. const string tool_name = "some_tool_name"; string usage = Flags::Usage(tool_name + "<flags>", {Flag("some_int", &some_int, "some int"), |