diff options
author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 10:36:28 +0000 |
---|---|---|
committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 10:36:28 +0000 |
commit | 515f2492fbc0a023eb089e91e349106da325de5e (patch) | |
tree | d606fd354fe6c4695fe2f635e62774fe582e8232 /base/pr_time_unittest.cc | |
parent | a834a1abc0a318a563d9a0eb3adec0df2947a982 (diff) | |
download | chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.zip chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.tar.gz chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.tar.bz2 |
Clang: enable -Wbool-conversions and -Wunused-variables on Linux.
-Wbool-conversion warns about EXPECT_EQ(false, blah), so replace
that with EXPECT_FALSE(blah). Do the same with EXPECT_EQ(true, blah)
for good measure (even though that doesn't generate warnings).
Also remove the one instance of an unused variable.
BUG=69421
TEST=buildbots all compile and all tests pass
Review URL: http://codereview.chromium.org/6300001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/pr_time_unittest.cc')
-rw-r--r-- | base/pr_time_unittest.cc | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/base/pr_time_unittest.cc b/base/pr_time_unittest.cc index 6dda299..646eb16 100644 --- a/base/pr_time_unittest.cc +++ b/base/pr_time_unittest.cc @@ -136,7 +136,7 @@ TEST_F(PRTimeTest, ParseTimeTest9) { TEST_F(PRTimeTest, ParseTimeTest10) { Time parsed_time; bool result = Time::FromString(L"15/10/07 12:45", &parsed_time); - EXPECT_EQ(true, result); + EXPECT_TRUE(result); time_t computed_time = parsed_time.ToTimeT(); time_t time_to_compare = comparison_time_local_ / @@ -149,7 +149,7 @@ TEST_F(PRTimeTest, ParseTimeTest11) { Time parsed_time; bool result = Time::FromString(L"Mon, 15 Oct 2007 19:45:00 GMT", &parsed_time); - EXPECT_EQ(true, result); + EXPECT_TRUE(result); time_t computed_time = parsed_time.ToTimeT(); time_t time_to_compare = comparison_time_pdt / Time::kMicrosecondsPerSecond; @@ -161,11 +161,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch0) { Time parsed_time; // time_t == epoch == 0 - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:00 +0100 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 01:00:00 +0100 1970", + &parsed_time)); EXPECT_EQ(0, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:00:00 GMT 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:00:00 GMT 1970", + &parsed_time)); EXPECT_EQ(0, parsed_time.ToTimeT()); } @@ -173,11 +173,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch1) { Time parsed_time; // time_t == 1 second after epoch == 1 - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:01 +0100 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 01:00:01 +0100 1970", + &parsed_time)); EXPECT_EQ(1, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:00:01 GMT 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:00:01 GMT 1970", + &parsed_time)); EXPECT_EQ(1, parsed_time.ToTimeT()); } @@ -185,11 +185,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch2) { Time parsed_time; // time_t == 2 seconds after epoch == 2 - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:02 +0100 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 01:00:02 +0100 1970", + &parsed_time)); EXPECT_EQ(2, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:00:02 GMT 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:00:02 GMT 1970", + &parsed_time)); EXPECT_EQ(2, parsed_time.ToTimeT()); } @@ -197,11 +197,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpochNeg1) { Time parsed_time; // time_t == 1 second before epoch == -1 - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:59:59 +0100 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:59:59 +0100 1970", + &parsed_time)); EXPECT_EQ(-1, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Wed Dec 31 23:59:59 GMT 1969", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Wed Dec 31 23:59:59 GMT 1969", + &parsed_time)); EXPECT_EQ(-1, parsed_time.ToTimeT()); } @@ -211,8 +211,8 @@ TEST_F(PRTimeTest, ParseTimeTestEpochNeg1) { TEST_F(PRTimeTest, ParseTimeTestEpochNotNeg1) { Time parsed_time; - EXPECT_EQ(true, Time::FromString(L"Wed Dec 31 23:59:59 GMT 2100", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Wed Dec 31 23:59:59 GMT 2100", + &parsed_time)); EXPECT_NE(-1, parsed_time.ToTimeT()); } @@ -220,11 +220,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpochNeg2) { Time parsed_time; // time_t == 2 seconds before epoch == -2 - EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:59:58 +0100 1970", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:59:58 +0100 1970", + &parsed_time)); EXPECT_EQ(-2, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Wed Dec 31 23:59:58 GMT 1969", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Wed Dec 31 23:59:58 GMT 1969", + &parsed_time)); EXPECT_EQ(-2, parsed_time.ToTimeT()); } @@ -232,14 +232,14 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch1960) { Time parsed_time; // time_t before Epoch, in 1960 - EXPECT_EQ(true, Time::FromString(L"Wed Jun 29 19:40:01 +0100 1960", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Wed Jun 29 19:40:01 +0100 1960", + &parsed_time)); EXPECT_EQ(-299999999, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Wed Jun 29 18:40:01 GMT 1960", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Wed Jun 29 18:40:01 GMT 1960", + &parsed_time)); EXPECT_EQ(-299999999, parsed_time.ToTimeT()); - EXPECT_EQ(true, Time::FromString(L"Wed Jun 29 17:40:01 GMT 1960", - &parsed_time)); + EXPECT_TRUE(Time::FromString(L"Wed Jun 29 17:40:01 GMT 1960", + &parsed_time)); EXPECT_EQ(-300003599, parsed_time.ToTimeT()); } |