diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-06-16 13:19:00 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-18 01:39:59 +0000 |
| commit | d2779df63aaad8b65fc5d4badee7dbc9bed7f2b6 (patch) | |
| tree | e34a511ee4068d8d9cd46a992a4e147f3afbd351 /utils_unittest.cc | |
| parent | b683327ed3f50ef89324069fc87ee076b65bee46 (diff) | |
update_engine: fixed warnings from cpplint
Fixed all the cpplint warnings in update engine.
BUG=None
TEST=Unit tests still pass.
Change-Id: I285ae858eec8abe0b26ff203b99a42a200ceb71c
Reviewed-on: https://chromium-review.googlesource.com/204027
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'utils_unittest.cc')
| -rw-r--r-- | utils_unittest.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/utils_unittest.cc b/utils_unittest.cc index 3a4ec6ad..fa97f557 100644 --- a/utils_unittest.cc +++ b/utils_unittest.cc @@ -96,8 +96,10 @@ TEST(UtilsTest, NormalizePathTest) { true)); EXPECT_EQ("\\\\", utils::NormalizePath("\\\\", false)); EXPECT_EQ("\\\\", utils::NormalizePath("\\\\", true)); - EXPECT_EQ("\\:/;$PATH\n\\", utils::NormalizePath("\\://;$PATH\n\\", false)); - EXPECT_EQ("\\:/;$PATH\n\\", utils::NormalizePath("\\://;$PATH\n\\", true)); + EXPECT_EQ("\\:/;$PATH\n\\", + utils::NormalizePath("\\://;$PATH\n\\", false)); + EXPECT_EQ("\\:/;$PATH\n\\", + utils::NormalizePath("\\://;$PATH\n\\", true)); EXPECT_EQ("/spaces s/ ok/s / / /", utils::NormalizePath("/spaces s/ ok/s / / /", false)); EXPECT_EQ("/spaces s/ ok/s / / ", @@ -212,14 +214,6 @@ TEST(UtilsTest, IsDirTest) { ASSERT_TRUE(utils::RecursiveUnlinkDir(temp_dir)); } -TEST(UtilsTest, TempFilenameTest) { - const string original = "/foo.XXXXXX"; - const string result = utils::TempFilename(original); - EXPECT_EQ(original.size(), result.size()); - EXPECT_TRUE(utils::StringHasPrefix(result, "/foo.")); - EXPECT_FALSE(utils::StringHasSuffix(result, "XXXXXX")); -} - TEST(UtilsTest, GetDiskNameTest) { EXPECT_EQ("/dev/sda", utils::GetDiskName("/dev/sda3")); EXPECT_EQ("/dev/sdp", utils::GetDiskName("/dev/sdp1234")); @@ -408,7 +402,7 @@ gboolean TerminateScheduleCrashReporterUploadTest(void* arg) { g_main_loop_quit(loop); return FALSE; // Don't call this callback again } -} // namespace {} +} // namespace TEST(UtilsTest, ScheduleCrashReporterUploadTest) { // Not much to test. At least this tests for memory leaks, crashes, @@ -551,7 +545,7 @@ TEST(UtilsTest, ConvertToOmahaInstallDate) { // offset which is one hour. Conveniently, if the function were // someday modified to be DST aware, this test would have to be // modified as well. - const time_t dst_time = 1180940400; // Jun 4, 2007 0:00 PDT. + const time_t dst_time = 1180940400; // Jun 4, 2007 0:00 PDT. const time_t fudge = 3600; int value1, value2; EXPECT_TRUE(utils::ConvertToOmahaInstallDate( |