update_engine: Run clang-format on common/
BUG=none
TEST=unittest
Change-Id: Icdaf5017e03a197bc576f08f4b8dcdd00cff217c
Reviewed-on: https://chromium-review.googlesource.com/1407541
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
diff --git a/common/utils_unittest.cc b/common/utils_unittest.cc
index b30b2d2..7d1c59e 100644
--- a/common/utils_unittest.cc
+++ b/common/utils_unittest.cc
@@ -39,16 +39,16 @@
namespace chromeos_update_engine {
-class UtilsTest : public ::testing::Test { };
+class UtilsTest : public ::testing::Test {};
TEST(UtilsTest, CanParseECVersion) {
// Should be able to parse and valid key value line.
EXPECT_EQ("12345", utils::ParseECVersion("fw_version=12345"));
- EXPECT_EQ("123456", utils::ParseECVersion(
- "b=1231a fw_version=123456 a=fasd2"));
+ EXPECT_EQ("123456",
+ utils::ParseECVersion("b=1231a fw_version=123456 a=fasd2"));
EXPECT_EQ("12345", utils::ParseECVersion("fw_version=12345"));
- EXPECT_EQ("00VFA616", utils::ParseECVersion(
- "vendor=\"sam\" fw_version=\"00VFA616\""));
+ EXPECT_EQ("00VFA616",
+ utils::ParseECVersion("vendor=\"sam\" fw_version=\"00VFA616\""));
// For invalid entries, should return the empty string.
EXPECT_EQ("", utils::ParseECVersion("b=1231a fw_version a=fasd2"));
@@ -172,21 +172,18 @@
utils::MakePartitionNameForMount("/dev/mmcblk0p2"));
EXPECT_EQ("/dev/loop0", utils::MakePartitionNameForMount("/dev/loop0"));
EXPECT_EQ("/dev/loop8", utils::MakePartitionNameForMount("/dev/loop8"));
- EXPECT_EQ("/dev/loop12p2",
- utils::MakePartitionNameForMount("/dev/loop12p2"));
+ EXPECT_EQ("/dev/loop12p2", utils::MakePartitionNameForMount("/dev/loop12p2"));
EXPECT_EQ("/dev/ubiblock5_0",
utils::MakePartitionNameForMount("/dev/ubiblock5_0"));
- EXPECT_EQ("/dev/mtd4",
- utils::MakePartitionNameForMount("/dev/ubi4_0"));
+ EXPECT_EQ("/dev/mtd4", utils::MakePartitionNameForMount("/dev/ubi4_0"));
EXPECT_EQ("/dev/ubiblock3_0",
utils::MakePartitionNameForMount("/dev/ubiblock3"));
EXPECT_EQ("/dev/mtd2", utils::MakePartitionNameForMount("/dev/ubi2"));
- EXPECT_EQ("/dev/ubi1_0",
- utils::MakePartitionNameForMount("/dev/ubiblock1"));
+ EXPECT_EQ("/dev/ubi1_0", utils::MakePartitionNameForMount("/dev/ubiblock1"));
}
TEST(UtilsTest, FuzzIntTest) {
- static const uint32_t kRanges[] = { 0, 1, 2, 20 };
+ static const uint32_t kRanges[] = {0, 1, 2, 20};
for (uint32_t range : kRanges) {
const int kValue = 50;
for (int tries = 0; tries < 100; ++tries) {
@@ -252,18 +249,12 @@
// which is not localized) so we only need to test the C locale
EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromMilliseconds(100)),
"0.1s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(0)),
- "0s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(1)),
- "1s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(59)),
- "59s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(60)),
- "1m0s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(61)),
- "1m1s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(90)),
- "1m30s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(0)), "0s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(1)), "1s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(59)), "59s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(60)), "1m0s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(61)), "1m1s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(90)), "1m30s");
EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(1205)),
"20m5s");
EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(3600)),
@@ -283,8 +274,7 @@
EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(200000) +
base::TimeDelta::FromMilliseconds(1)),
"2d7h33m20.001s");
- EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(-1)),
- "-1s");
+ EXPECT_EQ(utils::FormatTimeDelta(base::TimeDelta::FromSeconds(-1)), "-1s");
}
TEST(UtilsTest, ConvertToOmahaInstallDate) {
@@ -305,29 +295,29 @@
EXPECT_FALSE(utils::ConvertToOmahaInstallDate(
base::Time::FromTimeT(omaha_epoch - 1), &value));
EXPECT_FALSE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch - 100*24*3600), &value));
+ base::Time::FromTimeT(omaha_epoch - 100 * 24 * 3600), &value));
// Check that we jump from 0 to 7 exactly on the one-week mark, e.g.
// on Jan 8, 2007 0:00 PST.
EXPECT_TRUE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch + 7*24*3600 - 1), &value));
+ base::Time::FromTimeT(omaha_epoch + 7 * 24 * 3600 - 1), &value));
EXPECT_EQ(value, 0);
EXPECT_TRUE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch + 7*24*3600), &value));
+ base::Time::FromTimeT(omaha_epoch + 7 * 24 * 3600), &value));
EXPECT_EQ(value, 7);
// Check a couple of more values.
EXPECT_TRUE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch + 10*24*3600), &value));
+ base::Time::FromTimeT(omaha_epoch + 10 * 24 * 3600), &value));
EXPECT_EQ(value, 7);
EXPECT_TRUE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch + 20*24*3600), &value));
+ base::Time::FromTimeT(omaha_epoch + 20 * 24 * 3600), &value));
EXPECT_EQ(value, 14);
EXPECT_TRUE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch + 26*24*3600), &value));
+ base::Time::FromTimeT(omaha_epoch + 26 * 24 * 3600), &value));
EXPECT_EQ(value, 21);
EXPECT_TRUE(utils::ConvertToOmahaInstallDate(
- base::Time::FromTimeT(omaha_epoch + 29*24*3600), &value));
+ base::Time::FromTimeT(omaha_epoch + 29 * 24 * 3600), &value));
EXPECT_EQ(value, 28);
// The date Jun 4, 2007 0:00 PDT is a Monday and is hence a point